From 9408af37616f37994c2a50929fd6d66bfe35eeeb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 21 May 2010 00:30:27 +0200 Subject: [PATCH] xbps-src: make BUILD_32BIT work for packages using C++. --- xbps-src/shutils/buildvars_funcs.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xbps-src/shutils/buildvars_funcs.sh b/xbps-src/shutils/buildvars_funcs.sh index 841c484a8a2..1f1bf5c79ba 100644 --- a/xbps-src/shutils/buildvars_funcs.sh +++ b/xbps-src/shutils/buildvars_funcs.sh @@ -45,6 +45,7 @@ set_build_vars() LDFLAGS="-L/lib32 -L/usr/lib32 $LDFLAGS" export PATH="/bin:/usr/bin:$PATH" export CC="gcc -m32" + export CXX="g++ -m32" fi PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config" PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig" @@ -71,5 +72,8 @@ unset_build_vars() unset LD_LIBRARY_PATH export LD_LIBRARY_PATH=$SAVE_LDLIBPATH fi + if [ -n "$BUILD_32BIT" ]; then + unset CC CXX + fi unset PKG_CONFIG LDFLAGS CPPFLAGS PKG_CONFIG_LIBDIR CFLAGS CXXFLAGS }