diff --git a/vars/gcc.vars b/vars/gcc.vars
index 3638399..217c2b2 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -82,11 +82,11 @@ pkg_gcc_stage1_all() {
 		;;
 	gcc_stage1_cross_x86_64_w64_mingw32)
 		PKG_GCC_VERSION="${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_VERSION}";
-		set_build_dir cbb-gcc-${PKG_GCC_VERSION}_cross_${PKG_TARGET} cross;
+		set_build_dir cbb-gcc-${PKG_GCC_VERSION} cross;
 		;;
 	gcc_stage1_native_x86_64_w64_mingw32)
 		PKG_GCC_VERSION="${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_VERSION}";
-		set_build_dir cbb-gcc-${PKG_GCC_VERSION}_native_${PKG_TARGET} native;
+		set_build_dir cbb-gcc-${PKG_GCC_VERSION} native;
 		;;
 	esac;
 	# GCC, stage1.