{set,unset}_build_vars are not needed in the chroot.
--HG-- extra : convert_revision : 9d6a23fdba12bc1a4ef04d7579b677fb79e64ae9
This commit is contained in:
parent
ade1e606bd
commit
c658c03ba6
1 changed files with 4 additions and 0 deletions
4
xbps.sh
4
xbps.sh
|
@ -569,6 +569,8 @@ fixup_la_files()
|
||||||
|
|
||||||
set_build_vars()
|
set_build_vars()
|
||||||
{
|
{
|
||||||
|
[ "$XBPS_MASTERDIR" = "/" ] && return 0
|
||||||
|
|
||||||
LDFLAGS="-L$XBPS_MASTERDIR/usr/lib"
|
LDFLAGS="-L$XBPS_MASTERDIR/usr/lib"
|
||||||
SAVE_LDLIBPATH=$LD_LIBRARY_PATH
|
SAVE_LDLIBPATH=$LD_LIBRARY_PATH
|
||||||
LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib"
|
LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib"
|
||||||
|
@ -587,6 +589,8 @@ set_build_vars()
|
||||||
|
|
||||||
unset_build_vars()
|
unset_build_vars()
|
||||||
{
|
{
|
||||||
|
[ "$XBPS_MASTERDIR" = "/" ] && return 0
|
||||||
|
|
||||||
unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS PKG_CONFIG LD_LIBRARY_PATH
|
unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS PKG_CONFIG LD_LIBRARY_PATH
|
||||||
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
|
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue