diff --git a/Allwmake b/Allwmake
index 4ae49dca1d4e4959a4cea21f25feafbbdd7b6e74..f9edc15f2831533b039a78463bed03db9f073a65 100755
--- a/Allwmake
+++ b/Allwmake
@@ -24,7 +24,7 @@ command -v mpirun 2>/dev/null || true
 
 echo "========================================"
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
-echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*}"
+echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}"
 echo "  $WM_COMPILER $WM_COMPILER_TYPE compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo "========================================"
diff --git a/wmake/src/Allmake b/wmake/src/Allmake
index b4ced0078a19b0d1fc8d5c5d42015085c2c7739f..8e164107e2b1c87e4db901a4e61cd68e55b215db 100755
--- a/wmake/src/Allmake
+++ b/wmake/src/Allmake
@@ -7,9 +7,6 @@ then
     export WM_DIR
 fi
 
-# Compile wmake toolchain
-make
-
 case "$WM_COMPILER" in
 Mingw*)
     # Host wmake toolchain with system gcc (when cross-compiling)
@@ -17,6 +14,11 @@ Mingw*)
         WM_COMPILER=Gcc WM_COMPILER_TYPE=system \
         WMAKE_BIN="${WM_DIR}/platforms/${WM_ARCH}${WM_COMPILER}"
     ;;
+
+*)
+    # Compile wmake toolchain
+    make
+    ;;
 esac
 
 #------------------------------------------------------------------------------