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.
This commit is contained in:
Mark Olesen
2020-11-16 08:29:39 +01:00
parent 69cff3b3d3
commit 834efe6dda
3 changed files with 12 additions and 2 deletions

View File

@ -211,6 +211,16 @@ useGcc()
export CXX=g++ 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 # Scan arguments for a '-gcc' option, forcing gcc/g++ when found
useGccFlag() useGccFlag()
{ {

View File

@ -73,7 +73,7 @@ do
case "$1" in case "$1" in
'') ;; # Ignore empty '') ;; # Ignore empty
-h | -help) usage ;; -h | -help) usage ;;
-gcc) useGcc ;; -gcc) useGccWmake ;;
lib|libso) lib|libso)
targetType="$1" targetType="$1"

View File

@ -96,7 +96,7 @@ do
case "$1" in case "$1" in
'') ;; # Ignore empty '') ;; # Ignore empty
-h | -help) usage ;; -h | -help) usage ;;
-gcc) useGcc ;; -gcc) useGccWmake ;;
-force) optForce=true ;; -force) optForce=true ;;
-cmake) -cmake)