Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Nov 2014 21:39:28 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r274985 - head/share/mk
Message-ID:  <201411242139.sAOLdSow005036@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Nov 24 21:39:28 2014
New Revision: 274985
URL: https://svnweb.freebsd.org/changeset/base/274985

Log:
  Correctly specify -L for internal and private libs

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

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Mon Nov 24 21:31:08 2014	(r274984)
+++ head/share/mk/src.libnames.mk	Mon Nov 24 21:39:28 2014	(r274985)
@@ -157,13 +157,13 @@ LDADD_supcplusplus=	-lsupc++
 
 .for _l in ${_LIBRARIES}
 .if ${_PRIVATELIBS:M${_l}}
-LDADD+=		-L${LIB${_l:tu}DIR}
+LDADD_${_l}_L+=		-L${LIB${_l:tu}DIR}
 .endif
 .if ${_INTERNALIBS:M${_l}}
-LDADD+=		-L${LIB${_l:tu}DIR}
+LDADD_${_l}_L+=		-L${LIB${_l:tu}DIR}
 .endif
 DPADD_${_l}?=	${LIB${_l:tu}}
-LDADD_${_l}?=	-l${_l}
+LDADD_${_l}?=	${LDADD_${_l}_L} -l${_l}
 .if defined(${_l}_depend) && defined(NO_SHARED)
 .for _d in ${_DP_${_l}}
 DPADD_${_l}+=	${DPADD_${_d}}



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