svn commit: r304553 - stable/10/lib/libc/tests/stdlib

Garrett Cooper ngie at FreeBSD.org
Sun Aug 21 05:08:39 UTC 2016


Author: ngie
Date: Sun Aug 21 05:08:37 2016
New Revision: 304553
URL: https://svnweb.freebsd.org/changeset/base/304553

Log:
  Unbreak the build when MK_TESTS != no after r304527
  
  - src.opts.mk should be bsd.own.mk on ^/stable/10
  - LIBADD should be DPADD/LDADD on ^/stable/10
  
  Pointyhat to:	kib
  Reported by:	Olivier Pinter <oliver.pinter at hardenedbsd.org>
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  stable/10/lib/libc/tests/stdlib/Makefile

Modified: stable/10/lib/libc/tests/stdlib/Makefile
==============================================================================
--- stable/10/lib/libc/tests/stdlib/Makefile	Sun Aug 21 00:48:41 2016	(r304552)
+++ stable/10/lib/libc/tests/stdlib/Makefile	Sun Aug 21 05:08:37 2016	(r304553)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.own.mk>
 
 ATF_TESTS_C+=		heapsort_test
 ATF_TESTS_C+=		mergesort_test
@@ -42,7 +42,8 @@ CFLAGS+=	-I${.CURDIR}
 
 CXXFLAGS.cxa_thread_atexit_test+=	-std=c++11
 CXXFLAGS.cxa_thread_atexit_nothr_test+=	-std=c++11
-LIBADD.cxa_thread_atexit_test+=		pthread
+DPADD.cxa_thread_atexit_test+=		${LIBPTHREAD}
+LDADD.cxa_thread_atexit_test+=		-lpthread
 
 .for t in h_getopt h_getopt_long
 CFLAGS.$t+=	-I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests


More information about the svn-src-all mailing list