Also pass LDFLAGS as before.
--HG-- extra : convert_revision : 54e27f1de2235c3f9a920a34003f2dd94f530a5a
This commit is contained in:
parent
abcce0a7b5
commit
b8e0a0f535
4
xbps.sh
4
xbps.sh
|
@ -557,6 +557,7 @@ fixup_la_files()
|
||||||
|
|
||||||
set_build_vars()
|
set_build_vars()
|
||||||
{
|
{
|
||||||
|
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"
|
||||||
CFLAGS="$CFLAGS $XBPS_CFLAGS"
|
CFLAGS="$CFLAGS $XBPS_CFLAGS"
|
||||||
|
@ -569,11 +570,12 @@ set_build_vars()
|
||||||
export CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
|
export CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
|
||||||
export CPPFLAGS="$CPPFLAGS" PKG_CONFIG="$PKG_CONFIG"
|
export CPPFLAGS="$CPPFLAGS" PKG_CONFIG="$PKG_CONFIG"
|
||||||
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
|
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
|
||||||
|
export LDFLAGS="$LDFLAGS"
|
||||||
}
|
}
|
||||||
|
|
||||||
unset_build_vars()
|
unset_build_vars()
|
||||||
{
|
{
|
||||||
unset 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…
Reference in a new issue