The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4ca6ecf100733ecd61f32257452690c56a6b6a3e
commit 4ca6ecf100733ecd61f32257452690c56a6b6a3e Author: Jessica Clarke <[email protected]> AuthorDate: 2022-06-30 21:08:31 +0000 Commit: Jessica Clarke <[email protected]> CommitDate: 2022-06-30 21:08:31 +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") --- 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 8fa23f6da9bf..5e58e1d010ab 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -79,7 +79,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 c53ecd8a4dc2..de453564579d 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
