diff --git a/common/build-profiles/bootstrap.sh b/common/build-profiles/bootstrap.sh
new file mode 100644
index 00000000000..604347f79a3
--- /dev/null
+++ b/common/build-profiles/bootstrap.sh
@@ -0,0 +1,2 @@
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 4ad9d0dcc57..a7e53216c4b 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -328,13 +328,12 @@ setup_pkg() {
         dbgflags="-g"
     fi
 
-    if [ -z "$XBPS_CFLAGS" -a -z "$XBPS_CXXFLAGS" -a -n "$CHROOT_READY" ]; then
-        if [ -s ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh ]; then
-            . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
+    if [ -z "$XBPS_CFLAGS" -a -z "$XBPS_CXXFLAGS" ]; then
+        if [ -z "$CHROOT_READY" ]; then
+            source_file ${XBPS_COMMONDIR}/build-profiles/bootstrap.sh
+        else
+            source_file ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
         fi
-    else
-        XBPS_CFLAGS="-O2 -pipe"
-        XBPS_CXXFLAGS="$XBPS_CFLAGS"
     fi
     export CFLAGS="$XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
     export CXXFLAGS="$XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"