Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Dec 2015 00:16:34 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r292237 - head/share/mk
Message-ID:  <201512150016.tBF0GYxR001503@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Dec 15 00:16:34 2015
New Revision: 292237
URL: https://svnweb.freebsd.org/changeset/base/292237

Log:
  Follow-up r291739: Don't suggest LDADD on private libs to use LIBADD.
  
  This is because LDADD+=-lFOO is not the same as LDADD+=-lprivateFOO which is
  what the private libs in LIBADD are.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/src.libnames.mk

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Tue Dec 15 00:05:07 2015	(r292236)
+++ head/share/mk/src.libnames.mk	Tue Dec 15 00:16:34 2015	(r292237)
@@ -348,8 +348,9 @@ DPADD_atf_cxx+=	${DPADD_atf_c}
 LDADD_atf_cxx+=	${LDADD_atf_c}
 
 # Detect LDADD/DPADD that should be LIBADD, before modifying LDADD here.
+_BADLDADD=
 .for _l in ${LDADD:M-l*:N-l*/*:C,^-l,,}
-.if ${_LIBRARIES:M${_l}}
+.if ${_LIBRARIES:M${_l}} && !${_PRIVATELIBS:M${_l}}
 _BADLDADD+=	${_l}
 .endif
 .endfor



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512150016.tBF0GYxR001503>