diff --git a/common/xbps-src/libexec/build.sh b/common/xbps-src/libexec/build.sh
index cba71fbacad..26939b59279 100755
--- a/common/xbps-src/libexec/build.sh
+++ b/common/xbps-src/libexec/build.sh
@@ -29,6 +29,8 @@ done
 setup_pkg "$PKGNAME" $XBPS_CROSS_BUILD
 readonly SOURCEPKG="$sourcepkg"
 
+mkdir -p $XBPS_WRAPPERDIR
+
 show_pkg_build_options
 check_pkg_arch $XBPS_CROSS_BUILD
 
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index eb7a2545461..fa4e7b83519 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -643,8 +643,6 @@ setup_pkg() {
     export XBPS_STATEDIR="${XBPS_BUILDDIR}/.xbps-${sourcepkg}"
     export XBPS_WRAPPERDIR="${XBPS_STATEDIR}/wrappers"
 
-    mkdir -p $XBPS_STATEDIR $XBPS_WRAPPERDIR
-
     source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
 
     # Source all build-helper files that are defined