diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr
index 21bc3a8..c45028b 100644
--- a/subr/ex_pkg_exec.subr
+++ b/subr/ex_pkg_exec.subr
@@ -13,8 +13,9 @@ exp_pkg_exec_pre() {
 	elif ! ex_pkg_state_test "${_pkg_name}" "start" "${_restart_at}"; then
 		if [ "${PKG_NO_CLEAN_BASE_DIR:-0}" -eq 0 ]; then
 			ex_rtl_fileop rm "${PKG_BASE_DIR}" "${PKG_BUILD_DIR}" "${PKG_DESTDIR}";
-			ex_rtl_fileop mkdir "${PKG_BASE_DIR}" "${PKG_BUILD_DIR}" "${PKG_DESTDIR}";
+			ex_rtl_fileop mkdir "${PKG_BASE_DIR}";
 		fi;
+		ex_rtl_fileop mkdir "${PKG_BUILD_DIR}" "${PKG_DESTDIR}";
 		ex_pkg_state_set "${_pkg_name}" "start";
 	fi;
 	ex_rtl_fileop cd "${PKG_BUILD_DIR}";
diff --git a/vars/build.vars b/vars/build.vars
index f0246f9..2ca6367 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -437,7 +437,6 @@ NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBFIRM_BUILD_DIR:=build/libfirm};
 : ${PKG_LIBFIRM_CONFIGURE:=bfirm/configure};
 : ${PKG_LIBFIRM_CONFIGURE_ARGS:="--source-dir=../../libfirm --prefix="};
-: ${PKG_LIBFIRM_DISABLED:=1};
 : ${PKG_LIBGCRYPT_SHA256SUM:=3b67862e2f4711e25c4ce3cc4b48d52a58a3afdcd1d8c6a57f93a1c0ef03e5c6};
 : ${PKG_LIBGCRYPT_VERSION:=1.7.4};
 : ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2};
@@ -763,7 +762,7 @@ NATIVE_PACKAGES_DEV_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CPARSER_BUILD_DIR:=build/cparser};
 : ${PKG_CPARSER_CONFIGURE:=bcparser/configure};
 : ${PKG_CPARSER_CONFIGURE_ARGS:="--source-dir=../../cparser --prefix="};
-: ${PKG_CPARSER_DISABLED:=1};
+: ${PKG_CPARSER_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_DIFFUTILS_SHA256SUM:=d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6};
 : ${PKG_DIFFUTILS_VERSION:=3.6};
 : ${PKG_DIFFUTILS_URL:=https://ftp.gnu.org/gnu/diffutils/diffutils-${PKG_DIFFUTILS_VERSION}.tar.xz};