diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/elftoolchain.subdir.mk | 4 | ||||
| -rw-r--r-- | mk/elftoolchain.test.mk | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/mk/elftoolchain.subdir.mk b/mk/elftoolchain.subdir.mk index 9b323bae6c3f..a251506c8fe8 100644 --- a/mk/elftoolchain.subdir.mk +++ b/mk/elftoolchain.subdir.mk @@ -1,6 +1,6 @@ # # Rules for recursing into directories -# $Id: elftoolchain.subdir.mk 3608 2018-04-14 21:23:04Z jkoshy $ +# $Id: elftoolchain.subdir.mk 3720 2019-03-23 08:40:59Z jkoshy $ # Pass down 'test' as a valid target. @@ -9,7 +9,7 @@ .if ${OS_HOST} == FreeBSD SUBDIR_TARGETS+= clobber test .elif ${OS_HOST} == OpenBSD -clobber test:: _SUBDIRUSE +clobber: _SUBDIRUSE .else # NetBSD, pmake on Linux TARGETS+= cleandepend clobber test .endif diff --git a/mk/elftoolchain.test.mk b/mk/elftoolchain.test.mk index 8fd933809cbe..77541b3d6a26 100644 --- a/mk/elftoolchain.test.mk +++ b/mk/elftoolchain.test.mk @@ -8,9 +8,8 @@ .endif TEST_BASE= $(TOP)/test/libtest -TEST_LIB= $(TEST_BASE)/lib -TEST_DRIVER= ${TEST_BASE}/driver -TEST_DRIVER_MAIN= $(TEST_DRIVER)/test_main.o +TEST_LIB= $(TEST_BASE)/lib # The test(3) API. +TEST_DRIVER= ${TEST_BASE}/driver # A command-line driver for tests. CFLAGS+= -I$(TEST_LIB) -I${TEST_DRIVER} @@ -29,7 +28,7 @@ _M4_SRCS= ${TEST_SRCS:M*.m4} SRCS= ${_C_SRCS} ${_M4_SRCS} # See <bsd.prog.mk> CLEANFILES+= ${_M4_SRCS:S/.m4$/.c/g} ${TEST_DATA} -${PROG}: ${TEST_DATA} ${TEST_LIB} ${TEST_DRIVER_MAIN} +${PROG}: ${TEST_DATA} .if defined(MAKE_TEST_SCAFFOLDING) && ${MAKE_TEST_SCAFFOLDING} == "yes" _TC_SRC= ${.OBJDIR}/tc.c # Test scaffolding. @@ -45,6 +44,6 @@ ${_TC_SRC}: ${_TEST_OBJS} .endif .endif -LDADD+= ${TEST_DRIVER_MAIN} -L${TEST_LIB} -ltest +LDADD+= -L${TEST_LIB} -ltest -L${TEST_DRIVER} -ldriver .include "${TOP}/mk/elftoolchain.prog.mk" |