jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: use bootstrap build-profile for the bootstrap target.

Browse source 
... otherwise the proper compiler flags are being used in the chroot case.
This commit is contained in:
Juan RP 2014-12-24 09:53:35 +01:00
parent a9a6e48b64
commit 897b504d6b
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/build-profiles/bootstrap.sh Normal file
View file

@ -0,0 +1,2 @@
XBPS_CFLAGS="-O2 -pipe"
XBPS_CXXFLAGS="$XBPS_CFLAGS"

11
common/xbps-src/shutils/common.sh
View file

@ -328,13 +328,12 @@ setup_pkg() {
dbgflags="-g" dbgflags="-g"
fi fi
if [ -z "$XBPS_CFLAGS" -a -z "$XBPS_CXXFLAGS" -a -n "$CHROOT_READY" ]; then if [ -z "$XBPS_CFLAGS" -a -z "$XBPS_CXXFLAGS" ]; then
if [ -s ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh ]; then if [ -z "$CHROOT_READY" ]; then
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh source_file ${XBPS_COMMONDIR}/build-profiles/bootstrap.sh
else
source_file ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
fi fi
else
XBPS_CFLAGS="-O2 -pipe"
XBPS_CXXFLAGS="$XBPS_CFLAGS"
fi fi
export CFLAGS="$XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags" export CFLAGS="$XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
export CXXFLAGS="$XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags" export CXXFLAGS="$XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"