xbps-src: make BUILD_32BIT work for packages using C++.
This commit is contained in:
parent
50150858eb
commit
9408af3761
1 changed files with 4 additions and 0 deletions
|
@ -45,6 +45,7 @@ set_build_vars()
|
||||||
LDFLAGS="-L/lib32 -L/usr/lib32 $LDFLAGS"
|
LDFLAGS="-L/lib32 -L/usr/lib32 $LDFLAGS"
|
||||||
export PATH="/bin:/usr/bin:$PATH"
|
export PATH="/bin:/usr/bin:$PATH"
|
||||||
export CC="gcc -m32"
|
export CC="gcc -m32"
|
||||||
|
export CXX="g++ -m32"
|
||||||
fi
|
fi
|
||||||
PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config"
|
PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config"
|
||||||
PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig"
|
PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig"
|
||||||
|
@ -71,5 +72,8 @@ unset_build_vars()
|
||||||
unset LD_LIBRARY_PATH
|
unset LD_LIBRARY_PATH
|
||||||
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
|
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
|
||||||
fi
|
fi
|
||||||
|
if [ -n "$BUILD_32BIT" ]; then
|
||||||
|
unset CC CXX
|
||||||
|
fi
|
||||||
unset PKG_CONFIG LDFLAGS CPPFLAGS PKG_CONFIG_LIBDIR CFLAGS CXXFLAGS
|
unset PKG_CONFIG LDFLAGS CPPFLAGS PKG_CONFIG_LIBDIR CFLAGS CXXFLAGS
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue