Skip to content
Snippets Groups Projects
Commit 53b88d99 authored by Mark OLESEN's avatar Mark OLESEN Committed by Andrew Heather
Browse files

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.
parent e02ed856
No related merge requests found
...@@ -24,7 +24,7 @@ command -v mpirun 2>/dev/null || true ...@@ -24,7 +24,7 @@ command -v mpirun 2>/dev/null || true
echo "========================================" echo "========================================"
date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown" 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_COMPILER $WM_COMPILER_TYPE compiler"
echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}" echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo "========================================" echo "========================================"
......
...@@ -7,9 +7,6 @@ then ...@@ -7,9 +7,6 @@ then
export WM_DIR export WM_DIR
fi fi
# Compile wmake toolchain
make
case "$WM_COMPILER" in case "$WM_COMPILER" in
Mingw*) Mingw*)
# Host wmake toolchain with system gcc (when cross-compiling) # Host wmake toolchain with system gcc (when cross-compiling)
...@@ -17,6 +14,11 @@ Mingw*) ...@@ -17,6 +14,11 @@ Mingw*)
WM_COMPILER=Gcc WM_COMPILER_TYPE=system \ WM_COMPILER=Gcc WM_COMPILER_TYPE=system \
WMAKE_BIN="${WM_DIR}/platforms/${WM_ARCH}${WM_COMPILER}" WMAKE_BIN="${WM_DIR}/platforms/${WM_ARCH}${WM_COMPILER}"
;; ;;
*)
# Compile wmake toolchain
make
;;
esac esac
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment