From 75d5240c5b4d2c348296924018625580ac0f8f7b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 22 Nov 2017 22:09:25 +0000 Subject: [PATCH] xbps-src: evaluate build_options before setting default flags Fixes #9454 --- common/xbps-src/shutils/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index e2b47b5285d..a4bb234e25c 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -427,6 +427,8 @@ setup_pkg() { fi fi + set_build_options + 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 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 fi - set_build_options - # Setup some specific package vars. if [ -z "$wrksrc" ]; then wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}"