mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
ENH: improve toolset naming
- if passed things like "clang-9", strip down to the base name "clang"
This commit is contained in:
12
makeCGAL
12
makeCGAL
@ -128,7 +128,7 @@ do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
-toolset=*)
|
-toolset=*)
|
||||||
optToolset="${1*=}"
|
optToolset="${1#*=}"
|
||||||
;;
|
;;
|
||||||
-sys*)
|
-sys*)
|
||||||
gmpPACKAGE="gmp-system"
|
gmpPACKAGE="gmp-system"
|
||||||
@ -268,7 +268,15 @@ else
|
|||||||
|
|
||||||
(*)
|
(*)
|
||||||
# Toolset for bootstrap and build
|
# Toolset for bootstrap and build
|
||||||
[ -n "$optToolset" ] || optToolset="$(whichCC)"
|
if [ -z "$optToolset" ]
|
||||||
|
then
|
||||||
|
optToolset="$(whichCC)"
|
||||||
|
# Base names for gcc-8, clang-9 etc.
|
||||||
|
case "$optToolset" in
|
||||||
|
(clang*) optToolset=clang;;
|
||||||
|
(gcc*) optToolset=gcc;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
buildOpt="toolset=$optToolset"
|
buildOpt="toolset=$optToolset"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Reference in New Issue
Block a user