From a0432bffa5e9825ac3c4d7db420ce01fe81125bf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 15 May 2010 18:20:56 +0200 Subject: [PATCH] xbps-src: do not set CFLAGS/CXXFLAGS multiple times via build_vars. --- xbps-src/shutils/buildvars_funcs.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xbps-src/shutils/buildvars_funcs.sh b/xbps-src/shutils/buildvars_funcs.sh index f09765e6d0b..56233604224 100644 --- a/xbps-src/shutils/buildvars_funcs.sh +++ b/xbps-src/shutils/buildvars_funcs.sh @@ -49,14 +49,14 @@ set_build_vars() export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" export PKG_CONFIG="$PKG_CONFIG" else - PKG_CONFIG="/usr/bin/pkg-config" - PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig" + export PKG_CONFIG="/usr/bin/pkg-config" + 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 - 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()