svn commit: r345650 - in projects/capsicum-test: share/mk tests/sys/capsicum-test

[Enji Cooper]

Author: ngie
Date: Thu Mar 28 19:58:29 2019
New Revision: 345650
URL: https://svnweb.freebsd.org/changeset/base/345650

Log:
  Push appending `NO_SHARED` to PROG_OVERRIDE_VARS down into bsd.progs.mk (where it should be)

Modified:
  projects/capsicum-test/share/mk/bsd.progs.mk
  projects/capsicum-test/tests/sys/capsicum-test/Makefile

Modified: projects/capsicum-test/share/mk/bsd.progs.mk
==============================================================================
--- projects/capsicum-test/share/mk/bsd.progs.mk	Thu Mar 28 19:56:35 2019	(r345649)
+++ projects/capsicum-test/share/mk/bsd.progs.mk	Thu Mar 28 19:58:29 2019	(r345650)
@@ -22,8 +22,8 @@ PROGS += ${PROGS_CXX}
 
 .if defined(PROG)
 # just one of many
-PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
-			PROGNAME SRCS STRIP WARNS
+PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_SHARED \
+			NO_WERROR PROGNAME SRCS STRIP WARNS
 PROG_VARS +=	CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD LIBADD \
 		LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}

Modified: projects/capsicum-test/tests/sys/capsicum-test/Makefile
==============================================================================
--- projects/capsicum-test/tests/sys/capsicum-test/Makefile	Thu Mar 28 19:56:35 2019	(r345649)
+++ projects/capsicum-test/tests/sys/capsicum-test/Makefile	Thu Mar 28 19:58:29 2019	(r345650)
@@ -30,7 +30,6 @@ SRCS.smoketest+=	\
 
 LIBADD.capsicum-test+=	gtest pthread
 
-PROG_OVERRIDE_VARS+=	NO_SHARED
 .for p in mini-me mini-me.noexec mini-me.setuid
 PROGS+=		$p
 NO_SHARED.$p=