Update Travis.

.github/travis_deploy.sh

@@ -103,6 +103,14 @@ else
 fi
 d=$d-$BM_C-$BM_B
 
+# remove redundant -m32/-m64/-x86/-x64 from directory name
+if [[ $d =~ ^((i386-darwin|i386-linux|i386-win32).*)(-m32|-x86)(-.+)?$ ]]; then
+   d="${BASH_REMATCH[1]}${BASH_REMATCH[4]}"
+fi
+if [[ $d =~ ^((amd64-darwin|amd64-linux|amd64-win64).*)(-m64|-x64)(-.+)?$ ]]; then
+   d="${BASH_REMATCH[1]}${BASH_REMATCH[4]}"
+fi
+
 if [[ -n $subdir ]]; then
     print_header "DEPLOY $subdir/$d"
 else

.github/travis_init.sh

@@ -134,18 +134,25 @@ if [[ -n $BM_CROSS ]]; then
 fi # BM_CROSS
 if [[ "$CC" == "false" ]]; then # generic
 if [[ -z $BM_CROSS ]]; then
-    case $BM_C in
-        clang | clang-m?? | clang-3.4-m?? | clang-[6789][0-9][0-9]-m??)
-            CC="clang"; CXX="clang++" ;; # standard system compiler
-        clang-[345].[0-9]-m??)
-            v=${BM_C:6:3}; CC="clang-$v"; CXX="clang++-$v"; SCAN_BUILD="scan-build-$v" ;;
-        gcc | gcc-m?? | gcc-mx32)
-            CC="gcc"; CXX="g++" ;; # standard system compiler
-        gcc-[34].[0-9]-m?? | gcc-[34].[0-9]-mx32)
-            v=${BM_C:4:3}; CC="gcc-$v"; CXX="g++-$v" ;;
-        gcc-[567]-m?? | gcc-[567]-mx32)
-            v=${BM_C:4:1}; CC="gcc-$v"; CXX="g++-$v" ;;
-    esac
+    if [[ $TRAVIS_OS_NAME == osx ]]; then
+        case $BM_C in
+            clang | clang-m?? | clang-[6789][0-9][0-9]-m?? | clang-10[0-9][0-9]-m??)
+                CC="clang"; CXX="clang++" ;; # standard system compiler
+        esac
+    else
+        case $BM_C in
+            clang | clang-m?? | clang-3.4-m??)
+                CC="clang"; CXX="clang++" ;; # standard system compiler
+            clang-[3456].[0-9]-m??)
+                v=${BM_C:6:3}; CC="clang-$v"; CXX="clang++-$v"; SCAN_BUILD="scan-build-$v" ;;
+            gcc | gcc-m?? | gcc-mx32)
+                CC="gcc"; CXX="g++" ;; # standard system compiler
+            gcc-[34].[0-9]-m?? | gcc-[34].[0-9]-mx32)
+                v=${BM_C:4:3}; CC="gcc-$v"; CXX="g++-$v" ;;
+            gcc-[5678]-m?? | gcc-[5678]-mx32)
+                v=${BM_C:4:1}; CC="gcc-$v"; CXX="g++-$v" ;;
+        esac
+    fi
 fi
 fi # generic
 case $BM_C in