ENH: improve toolset naming

- if passed things like "clang-9", strip down to the base name "clang"

ENH: improve toolset naming
- if passed things like "clang-9", strip down to the base name "clang"
cb75d015 · Mark Olesen · baae61e0 · cb75d015
Commit cb75d015 authored Dec 15, 2019 by Mark Olesen
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

makeCGAL makeCGAL +10 -2

No files found.
--- a/makeCGAL
+++ b/makeCGAL
@@ -128,7 +128,7 @@ do
        shift
        ;;
    -toolset=*)
-        optToolset="${1*=}"
+        optToolset="${1#*=}"
        ;;
    -sys*)
        gmpPACKAGE="gmp-system"
@@ -268,7 +268,15 @@ else

        (*)
            # 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"
            ;;
        esac