From c658c03ba6e88acf33f8f7da9987bc776310344d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 26 Oct 2008 00:44:31 +0200 Subject: [PATCH] {set,unset}_build_vars are not needed in the chroot. --HG-- extra : convert_revision : 9d6a23fdba12bc1a4ef04d7579b677fb79e64ae9 --- xbps.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xbps.sh b/xbps.sh index 3e685ea22b2..a958c8f5571 100755 --- a/xbps.sh +++ b/xbps.sh @@ -569,6 +569,8 @@ fixup_la_files() set_build_vars() { + [ "$XBPS_MASTERDIR" = "/" ] && return 0 + LDFLAGS="-L$XBPS_MASTERDIR/usr/lib" SAVE_LDLIBPATH=$LD_LIBRARY_PATH LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib" @@ -587,6 +589,8 @@ set_build_vars() unset_build_vars() { + [ "$XBPS_MASTERDIR" = "/" ] && return 0 + unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS PKG_CONFIG LD_LIBRARY_PATH export LD_LIBRARY_PATH=$SAVE_LDLIBPATH }