diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2022-06-30 21:08:31 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-07-27 18:33:59 +0000 |
| commit | 3cde8fbf97f139b99b38c6774042431b2d3be15a (patch) | |
| tree | db18f31088af6f9011a7b1984cf9927a792990ab | |
| parent | 37357e697d18ef53fbfb8c3dc6c762dc5dd78245 (diff) | |
| download | src-3cde8fbf97f139b99b38c6774042431b2d3be15a.tar.gz src-3cde8fbf97f139b99b38c6774042431b2d3be15a.zip | |
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)
| -rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
| -rw-r--r-- | 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 |