From 834efe6ddaca5037db474c87a60f0587971a03d3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 16 Nov 2020 08:29:39 +0100
Subject: [PATCH] COMP: handle forced use of gcc/g++ for wmake components

- does not change WM_OPTIONS or output directories, so that the target
  directories are correct.
---
 etc/tools/ThirdPartyFunctions | 10 ++++++++++
 makeCCMIO                     |  2 +-
 makeKAHIP                     |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/etc/tools/ThirdPartyFunctions b/etc/tools/ThirdPartyFunctions
index 29fc222..8cc3010 100644
--- a/etc/tools/ThirdPartyFunctions
+++ b/etc/tools/ThirdPartyFunctions
@@ -211,6 +211,16 @@ useGcc()
     export CXX=g++
 }
 
+
+# Force use of system gcc/g++ (wmake compilation) without changing the
+# WM_OPTIONS or output directories
+useGccWmake()
+{
+    export WM_COMPILER=Gcc
+    export WM_COMPILER_TYPE=system
+}
+
+
 # Scan arguments for a '-gcc' option, forcing gcc/g++ when found
 useGccFlag()
 {
diff --git a/makeCCMIO b/makeCCMIO
index 6068539..a3a2744 100755
--- a/makeCCMIO
+++ b/makeCCMIO
@@ -73,7 +73,7 @@ do
     case "$1" in
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
+    -gcc)       useGccWmake ;;
 
     lib|libso)
         targetType="$1"
diff --git a/makeKAHIP b/makeKAHIP
index d4e323e..1cf3ee9 100755
--- a/makeKAHIP
+++ b/makeKAHIP
@@ -96,7 +96,7 @@ do
     case "$1" in
     '') ;;      # Ignore empty
     -h | -help) usage   ;;
-    -gcc)       useGcc  ;;
+    -gcc)       useGccWmake ;;
     -force)     optForce=true ;;
 
     -cmake)