From 14410a736a03904f5a2b8ed58e158a03e721e5af Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 6 Aug 2020 17:50:44 +0200
Subject: [PATCH] BUG: directory information spoils "wmake -show-cxx" (fixes
 #1799)

- the various information queries MUST be executed with
  the '--no-print-directory' or risk polluting values
  in the information queries.

  This is mostly seen with the 'canCompile' test for tutorials running
  in parallel.
---
 wmake/wmake | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wmake/wmake b/wmake/wmake
index ce1a2185a7..2cecf2e2f5 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -152,6 +152,8 @@ die()
 # Default make is the "make" in the path
 make="make"
 
+# Print compiler/system information (serial only)
+printInfo() { make --no-print-directory -f "$WM_DIR"/makefiles/info "$@"; }
 
 #------------------------------------------------------------------------------
 
@@ -189,11 +191,11 @@ do
         -show-api | -show-ext-so | \
         -show-compile-c   | -show-c   | -show-cflags   | -show-cflags-arch | \
         -show-compile-cxx | -show-cxx | -show-cxxflags | -show-cxxflags-arch )
-            $make -f $WM_DIR/makefiles/info "${1#-show-}"
+            printInfo "${1#-show-}"
             optShow=true
             ;;
         -show-path-c | -show-path-cxx )
-            command -v $($make -f $WM_DIR/makefiles/info "${1#-show-path-}")
+            command -v $(printInfo "${1#-show-path-}")
             optShow=true
             ;;
         -a | -all | all)
@@ -240,7 +242,7 @@ do
             : ${all:=all}  # implies 'all', unless previous set to 'queue' etc.
             ;;
         -version | --version)
-            $make -f $WM_DIR/makefiles/info api
+            printInfo api
             optShow=true
             break;
             ;;