aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Rizzo <luigi@FreeBSD.org>2015-07-10 05:07:18 +0000
committerLuigi Rizzo <luigi@FreeBSD.org>2015-07-10 05:07:18 +0000
commit9d73ee0f82b756db5e53a32e55766db958d41dba (patch)
tree53471c390bce027bca5986a99fda9bcb1cd935f0
parent0b75d21e18f5d9d3d9b1b672055c2887963aa5de (diff)
Notes
-rwxr-xr-xrelease/picobsd/build/picobsd6
1 files changed, 5 insertions, 1 deletions
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 61eaa2215d84..2b04be4709b0 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -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"