zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: directory information spoils "wmake -show-cxx" (fixes #1799)

Browse Source 
- 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.
This commit is contained in:
Mark Olesen
2020-08-06 17:50:44 +02:00
parent 67a17f7c78
commit 9ef144118d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wmake/wmake
View File

@ -177,6 +177,8 @@ die()
# Default make is the "make" in the path # Default make is the "make" in the path
make="make" make="make"
# Print compiler/system information (serial only)
printInfo() { make --no-print-directory -f "$WM_DIR"/makefiles/info "$@"; }
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -268,11 +270,11 @@ do
-show-api | -show-ext-so | \ -show-api | -show-ext-so | \
-show-compile-c | -show-c | -show-cflags | -show-cflags-arch | \ -show-compile-c | -show-c | -show-cflags | -show-cflags-arch | \
-show-compile-cxx | -show-cxx | -show-cxxflags | -show-cxxflags-arch ) -show-compile-cxx | -show-cxx | -show-cxxflags | -show-cxxflags-arch )
$make -f $WM_DIR/makefiles/info "${1#-show-}" printInfo "${1#-show-}"
optShow=true optShow=true
;; ;;
-show-path-c | -show-path-cxx ) -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 optShow=true
;; ;;
-a | -all | all) -a | -all | all)
@ -323,7 +325,7 @@ do
: "${optAll:=all}" # implies 'all', unless previously set : "${optAll:=all}" # implies 'all', unless previously set
;; ;;
-version | --version) -version | --version)
$make -f $WM_DIR/makefiles/info api printInfo api
optShow=true optShow=true
break; break;
;; ;;