diff --git a/xbps.sh b/xbps.sh index fb236d969e9..cda39846b37 100755 --- a/xbps.sh +++ b/xbps.sh @@ -557,6 +557,7 @@ fixup_la_files() set_build_vars() { + LDFLAGS="-L$XBPS_MASTERDIR/usr/lib" SAVE_LDLIBPATH=$LD_LIBRARY_PATH LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib" CFLAGS="$CFLAGS $XBPS_CFLAGS" @@ -569,11 +570,12 @@ set_build_vars() export CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" export CPPFLAGS="$CPPFLAGS" PKG_CONFIG="$PKG_CONFIG" export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" + export LDFLAGS="$LDFLAGS" } 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 }