ENH: improve toolset naming

- if passed things like "clang-9", strip down to the base name "clang"
This commit is contained in:
Mark Olesen
2019-12-15 13:44:04 +01:00
parent baae61e0ec
commit cb75d01584

View File

@ -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