From 53b88d99a3b897caeed7ef6b2b4c330ef285813a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 9 Jun 2019 19:21:27 +0200
Subject: [PATCH] COMP: only compile wmake toolchain for host when
cross-compiling
- no use having wmkdepend on the target architecture when it will only
be needed on the host architecture.
---
Allwmake | 2 +-
wmake/src/Allmake | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Allwmake b/Allwmake
index 4ae49dca1d4..f9edc15f283 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 b4ced0078a1..8e164107e2b 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
#------------------------------------------------------------------------------
--
GitLab