Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Jul 2015 05:07:19 +0000 (UTC)
From:      Luigi Rizzo <luigi@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r285348 - head/release/picobsd/build
Message-ID:  <201507100507.t6A57Jaa027041@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"



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