moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: evaluate build_options before setting default flags

Browse source 
Fixes #9454
This commit is contained in:
Michael Gehring 2017-11-22 22:09:25 +00:00 • committed by Enno Boland
parent 0adf7415b7
commit 75d5240c5b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -427,6 +427,8 @@ setup_pkg() {
fi fi
fi fi
set_build_options
export CFLAGS="$XBPS_TARGET_CFLAGS $XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags" export CFLAGS="$XBPS_TARGET_CFLAGS $XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
export CXXFLAGS="$XBPS_TARGET_CXXFLAGS $XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags" export CXXFLAGS="$XBPS_TARGET_CXXFLAGS $XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"
export FFLAGS="$XBPS_TARGET_FFLAGS $XBPS_FFLAGS $XBPS_CROSS_FFLAGS $FFLAGS" export FFLAGS="$XBPS_TARGET_FFLAGS $XBPS_FFLAGS $XBPS_CROSS_FFLAGS $FFLAGS"
@ -531,8 +533,6 @@ setup_pkg() {
unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host
fi fi
set_build_options
# Setup some specific package vars. # Setup some specific package vars.
if [ -z "$wrksrc" ]; then if [ -z "$wrksrc" ]; then
wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}" wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}"