Module Name: src
Committed By: martin
Date: Thu Feb 29 13:00:14 UTC 2024
Modified Files:
src/share/mk [netbsd-9]: bsd.prog.mk bsd.sys.mk
Log Message:
Part of ticket #1804 accidently not commited
To generate a diff of this commit:
cvs rdiff -u -r1.319.2.3 -r1.319.2.4 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.292.2.1 -r1.292.2.2 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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.319.2.3 src/share/mk/bsd.prog.mk:1.319.2.4
--- src/share/mk/bsd.prog.mk:1.319.2.3 Sun Sep 1 10:44:22 2019
+++ src/share/mk/bsd.prog.mk Thu Feb 29 13:00:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.319.2.3 2019/09/01 10:44:22 martin Exp $
+# $NetBSD: bsd.prog.mk,v 1.319.2.4 2024/02/29 13:00:14 martin Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -434,6 +434,10 @@ DPADD+= ${PROGDO.${_lib}}/lib${_lib}.a
.endif
.endfor
.endif # }
+
+LDADD+=${LDADD_AFTER}
+DPADD+=${DPADD_AFTER}
+
#
# Per-program definitions and targets.
#
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.292.2.1 src/share/mk/bsd.sys.mk:1.292.2.2
--- src/share/mk/bsd.sys.mk:1.292.2.1 Tue Dec 24 17:32:20 2019
+++ src/share/mk/bsd.sys.mk Thu Feb 29 13:00:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.292.2.1 2019/12/24 17:32:20 martin Exp $
+# $NetBSD: bsd.sys.mk,v 1.292.2.2 2024/02/29 13:00:14 martin Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -53,7 +53,7 @@ CXXFLAGS+= ${REPROFLAGS}
# NetBSD sources use C99 style, with some GCC extensions.
# Coverity does not like -std=gnu99
-.if !defined(COVERITY_TOP_CONFIG)
+.if !defined(COVERITY_TOP_CONFIG) && empty(CFLAGS:M*-std=*)
CFLAGS+= ${${ACTIVE_CC} == "clang":? -std=gnu99 :}
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -std=gnu99 :}
CFLAGS+= ${${ACTIVE_CC} == "pcc":? -std=gnu99 :}
