Module Name: src
Committed By: lukem
Date: Sat Jun 3 21:24:58 UTC 2023
Modified Files:
src/share/mk: bsd.lib.mk bsd.lua.mk bsd.own.mk bsd.sys.mk
Log Message:
bsd.*.mk: move MKSTRIPSYM default to bsd.own.mk
Add default for MKSTRIPSYM=yes to to bsd.own.mk _MKVARS.no.
Test ${MKSTRIPSYM} != "no".
To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.9 -r1.10 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.1340 -r1.1341 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.313 -r1.314 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.393 src/share/mk/bsd.lib.mk:1.394
--- src/share/mk/bsd.lib.mk:1.393 Sun May 28 10:33:13 2023
+++ src/share/mk/bsd.lib.mk Sat Jun 3 21:24:57 2023
@@ -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
Index: src/share/mk/bsd.lua.mk
diff -u src/share/mk/bsd.lua.mk:1.9 src/share/mk/bsd.lua.mk:1.10
--- src/share/mk/bsd.lua.mk:1.9 Sun Apr 16 20:46:17 2023
+++ src/share/mk/bsd.lua.mk Sat Jun 3 21:24:57 2023
@@ -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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1340 src/share/mk/bsd.own.mk:1.1341
--- src/share/mk/bsd.own.mk:1.1340 Sat Jun 3 21:23:49 2023
+++ src/share/mk/bsd.own.mk Sat Jun 3 21:24:57 2023
@@ -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
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.313 src/share/mk/bsd.sys.mk:1.314
--- src/share/mk/bsd.sys.mk:1.313 Sat Apr 29 20:31:59 2023
+++ src/share/mk/bsd.sys.mk Sat Jun 3 21:24:57 2023
@@ -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]' -
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}
