Module Name: src
Committed By: christos
Date: Sat Jun 2 03:02:30 UTC 2018
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Move the RELRO and the SANITIZER stuff outside of the WARNS conditional!
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 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.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.278 src/share/mk/bsd.sys.mk:1.279
--- src/share/mk/bsd.sys.mk:1.278 Fri Jun 1 21:41:49 2018
+++ src/share/mk/bsd.sys.mk Fri Jun 1 23:02:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.278 2018/06/02 01:41:49 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.279 2018/06/02 03:02:30 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -70,13 +70,6 @@ CFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno
CFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wa,--fatal-warnings :}
.endif
-.if ${MKRELRO:Uno} != "no"
-LDFLAGS+= -Wl,-z,relro
-.endif
-.if ${MKRELRO:Uno} == "full"
-LDFLAGS+= -Wl,-z,now
-.endif
-
# Set linker warnings to be fatal
# XXX no proper way to avoid "FOO is a patented algorithm" warnings
# XXX on linking static libs
@@ -89,12 +82,6 @@ LDFLAGS+= -Wl,--fatal-warnings
.endif
.endif
-.if ${MKSANITIZER:Uno} == "yes"
-CFLAGS+= -fsanitize=${USE_SANITIZER}
-CXXFLAGS+= -fsanitize=${USE_SANITIZER}
-LDFLAGS+= -fsanitize=${USE_SANITIZER}
-.endif
-
LDFLAGS+= -Wl,--warn-shared-textrel
.if ${WARNS} > 1
@@ -135,6 +122,20 @@ CFLAGS+= -Wno-maybe-uninitialized
.endif
.endif
+.if ${MKRELRO:Uno} != "no"
+LDFLAGS+= -Wl,-z,relro
+.endif
+.if ${MKRELRO:Uno} == "full"
+LDFLAGS+= -Wl,-z,now
+.endif
+
+.if ${MKSANITIZER:Uno} == "yes"
+CFLAGS+= -fsanitize=${USE_SANITIZER}
+CXXFLAGS+= -fsanitize=${USE_SANITIZER}
+LDFLAGS+= -fsanitize=${USE_SANITIZER}
+.endif
+
+
CWARNFLAGS+= ${CWARNFLAGS.${ACTIVE_CC}}
CPPFLAGS+= ${AUDIT:D-D__AUDIT__}
