From owner-svn-src-all@FreeBSD.ORG  Mon Nov 24 21:39:29 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B160847;
 Mon, 24 Nov 2014 21:39:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1796D791;
 Mon, 24 Nov 2014 21:39:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOLdSoR005037;
 Mon, 24 Nov 2014 21:39:28 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOLdSow005036;
 Mon, 24 Nov 2014 21:39:28 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201411242139.sAOLdSow005036@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 24 Nov 2014 21:39:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274985 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Nov 2014 21:39:29 -0000

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}}