From a5b08c1484eac2c6a65e726f550b3189ff84c6c8 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 29 Jun 2019 15:27:18 +0000
Subject: Import ELF Tool Chain snapshot at r3769

From https://svn.code.sf.net/p/elftoolchain/code/
---
 mk/elftoolchain.test.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'mk/elftoolchain.test.mk')

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"
-- 
cgit v1.3