summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 21:24:57 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 21:24:57 +0000
commitcd2a6834f02a5d50c1503a8b2d0b516f26d8a1bb (patch)
tree929d8263435e677ce11aeb551879d9fbd12e763f
parentf5db569fb15e12135caccc49ce29b3888afa6e78 (diff)
bsd.*.mk: move MKSTRIPSYM default to bsd.own.mk
Add default for MKSTRIPSYM=yes to to bsd.own.mk _MKVARS.no. Test ${MKSTRIPSYM} != "no".
-rw-r--r--share/mk/bsd.lib.mk4
-rw-r--r--share/mk/bsd.lua.mk4
-rw-r--r--share/mk/bsd.own.mk3
-rw-r--r--share/mk/bsd.sys.mk4
4 files changed, 8 insertions, 7 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 2728dc1fe00..4db7809dda4 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.393 2023/05/28 10:33:13 lukem Exp $
+# $NetBSD: bsd.lib.mk,v 1.394 2023/06/03 21:24:57 lukem Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -563,7 +563,7 @@ _LIBLDOPTS+= -Wl,-rpath,${SHLIBDIR} \
_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
-L=${SHLIBINSTALLDIR}
.endif
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
_LIBLDOPTS+= -Wl,-x
.else
_LIBLDOPTS+= -Wl,-X
diff --git a/share/mk/bsd.lua.mk b/share/mk/bsd.lua.mk
index 362cf454b72..4d367894250 100644
--- a/share/mk/bsd.lua.mk
+++ b/share/mk/bsd.lua.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lua.mk,v 1.9 2023/04/16 20:46:17 nikita Exp $
+# $NetBSD: bsd.lua.mk,v 1.10 2023/06/03 21:24:57 lukem Exp $
#
# Build rules and definitions for Lua modules
@@ -129,7 +129,7 @@ DPSRCS+=${LUA_SRCS.${_M}}
SRCS+=${LUA_SRCS.${_M}}
LUA_LDOPTS= -Wl,--warn-shared-textrel
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
LUA_LDOPTS+= -Wl,-x
.else
LUA_LDOPTS+= -Wl,-X
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 0e29cef376c..454253c5704 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1340 2023/06/03 21:23:49 lukem Exp $
+# $NetBSD: bsd.own.mk,v 1.1341 2023/06/03 21:24:57 lukem Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1213,6 +1213,7 @@ _MKVARS.yes= \
MKSHARE \
MKSKEY \
MKSTATICLIB \
+ MKSTRIPSYM \
MKUNBOUND \
MKX11FONTS \
MKYP
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 1a34e9c9e34..bc20ff87b09 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.313 2023/04/29 20:31:59 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.314 2023/06/03 21:24:57 lukem Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -347,7 +347,7 @@ OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][dx]' -K '[$$][dx]\.*'
OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][adt]' -K '[$$][adt]\.*'
.endif
-.if ${MKSTRIPSYM:Uyes} == "yes"
+.if ${MKSTRIPSYM} != "no"
OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x} ${OBJCOPYLIBFLAGS_EXTRA}
.else
OBJCOPYLIBFLAGS?=-X ${OBJCOPYLIBFLAGS_EXTRA}