From owner-svn-src-all@freebsd.org  Fri Jul 10 05:07:19 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B82C13A54;
 Fri, 10 Jul 2015 05:07:19 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 9DCCA1DD8;
 Fri, 10 Jul 2015 05:07:19 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6A57JHb027042;
 Fri, 10 Jul 2015 05:07:19 GMT (envelope-from luigi@FreeBSD.org)
Received: (from luigi@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6A57Jaa027041;
 Fri, 10 Jul 2015 05:07:19 GMT (envelope-from luigi@FreeBSD.org)
Message-Id: <201507100507.t6A57Jaa027041@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: luigi set sender to
 luigi@FreeBSD.org using -f
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 10 Jul 2015 05:07:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285348 - head/release/picobsd/build
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.20
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: Fri, 10 Jul 2015 05:07:19 -0000

Author: luigi
Date: Fri Jul 10 05:07:18 2015
New Revision: 285348
URL: https://svnweb.freebsd.org/changeset/base/285348

Log:
  rev.284898 removed _SHLIBDIRPREFIX so we need to reconstruct its value
  to properly locate libraries created in the buildworld phase.

Modified:
  head/release/picobsd/build/picobsd

Modified: head/release/picobsd/build/picobsd
==============================================================================
--- head/release/picobsd/build/picobsd	Fri Jul 10 02:23:50 2015	(r285347)
+++ head/release/picobsd/build/picobsd	Fri Jul 10 05:07:18 2015	(r285348)
@@ -532,7 +532,11 @@ do_links() {	# rootdir varname
 # if no argument default to objdir/SHLIBDIRPREFIX for both
 find_progs() {	# programs
 	# logverbose "find_progs: called with $*"
-	local i=`realpath ${o_objdir:-${_SHLIBDIRPREFIX}/..}`
+	# rev.284898 removed _SHLIBDIRPREFIX so we need to reconstruct
+	# its value in i1
+	local i1=${_SHLIBDIRPREFIX:-${l_objtree}/${SRC}/tmp}
+	local i=`realpath ${o_objdir:-${i1}/..}`
+
 	# default values for -L and -P
 	local dir="-P $i"
 	local ldir="-L $i"