diff options
| author | luigi <luigi@FreeBSD.org> | 2015-07-10 05:07:18 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2015-07-10 05:07:18 +0000 |
| commit | 0f9bc3ce0cd3f89195d493ab53e62b96aed6a21a (patch) | |
| tree | 53471c390bce027bca5986a99fda9bcb1cd935f0 /release/picobsd | |
| parent | 4d0b1feb1d76f401edd35f1511cd4e7908942cae (diff) | |
| download | FreeBSD-src-0f9bc3ce0cd3f89195d493ab53e62b96aed6a21a.zip FreeBSD-src-0f9bc3ce0cd3f89195d493ab53e62b96aed6a21a.tar.gz | |
rev.284898 removed _SHLIBDIRPREFIX so we need to reconstruct its value
to properly locate libraries created in the buildworld phase.
Diffstat (limited to 'release/picobsd')
| -rwxr-xr-x | release/picobsd/build/picobsd | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd index 61eaa22..2b04be4 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" |
