tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xbps-src: do not set CFLAGS/CXXFLAGS multiple times via build_vars.

Browse Source
This commit is contained in:
Juan RP
2010-05-15 18:20:56 +02:00
parent 193f6746a2
commit a0432bffa5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xbps-src/shutils/buildvars_funcs.sh
View File

@@ -49,14 +49,14 @@ set_build_vars()
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
export PKG_CONFIG="$PKG_CONFIG" export PKG_CONFIG="$PKG_CONFIG"
else else
PKG_CONFIG="/usr/bin/pkg-config" export PKG_CONFIG="/usr/bin/pkg-config"
PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig" export PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
fi
if [ -z "${_BUILD_VARS_CFLAGS_SET}" ]; then
export CFLAGS="$CFLAGS $XBPS_CFLAGS"
export CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
_BUILD_VARS_CFLAGS_SET=1
fi fi
CFLAGS="$CFLAGS $XBPS_CFLAGS"
CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
export PKG_CONFIG="$PKG_CONFIG" PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" \
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
} }
unset_build_vars() unset_build_vars()