diff --git a/Allwmake b/Allwmake
index d46c7c6e575b50a4aa8263be6baf3c5ec8e3bcd3..c6e1ca4f8c8ca6fd451e909e46f0ac72f436a895 100755
--- a/Allwmake
+++ b/Allwmake
@@ -15,18 +15,22 @@ wmakeCheckPwd "$WM_PROJECT_DIR" 2>/dev/null || {
 . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
-# Preamble. Report compiler version
-case "$WM_COMPILER" in
-    Gcc*)    gcc --version 2>/dev/null | sed -ne '1p' ;;
-    Clang*)  clang --version 2>/dev/null | sed -ne '1p' ;;
-esac
-
 # Preamble. Report tools or at least the mpirun location
 if [ -f "$WM_PROJECT_DIR"/wmake/scripts/list_tools ]
-then  . "$WM_PROJECT_DIR"/wmake/scripts/list_tools ]
+then  . "$WM_PROJECT_DIR"/wmake/scripts/list_tools
 else
     echo "mpirun=$(command -v mpirun || true)"
 fi
+echo
+# Report compiler information
+compiler="$(wmake -show-path-cxx 2>/dev/null || true)"
+if [ -x "$compiler" ]
+then
+    echo "compiler=$compiler"
+    "$compiler" --version 2>/dev/null | sed -ne '1p'
+else
+    echo "compiler=unknown"
+fi
 
 echo
 echo "========================================"