Date: Thu, 27 Jul 2023 18:34:17 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 3cde8fbf97f1 - stable/13 - Really fix cross-builds from macOS Message-ID: <202307271834.36RIYHqW022086@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3cde8fbf97f139b99b38c6774042431b2d3be15a commit 3cde8fbf97f139b99b38c6774042431b2d3be15a Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2022-06-30 21:08:31 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2023-07-27 18:33:59 +0000 Really fix cross-builds from macOS LINKER_TYPE is set to mac not macos on macOS. Fixes: 7927452ac4e9 ("Add RELRO build knob, default to enabled") (cherry picked from commit 4ca6ecf100733ecd61f32257452690c56a6b6a3e) --- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 900bc00f0f03..d16ea6967b23 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -77,7 +77,7 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif -.if ${LINKER_TYPE} != "macos" +.if ${LINKER_TYPE} != "mac" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index d044fed0aeb7..fd44a5b40c8d 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -41,7 +41,7 @@ MK_DEBUG_FILES= no .if ${MK_BIND_NOW} != "no" LDFLAGS+= -Wl,-znow .endif -.if ${LINKER_TYPE} != "macos" +.if ${LINKER_TYPE} != "mac" .if ${MK_RELRO} == "no" LDFLAGS+= -Wl,-znorelro .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307271834.36RIYHqW022086>