update multibuild and make the switch labels clearer

isuruf · isuruf · commit 571bdeb41838 · 2021-01-29T10:58:32.000-06:00
diff --git a/multibuild b/multibuild
@@ -1 +1 @@
-Subproject commit 0d93db5422d6677aac5cf0ff4ecb731e5e629aa0
+Subproject commit 2bf2b360f084aaa4b166935c3bd279e2e842f6ff
diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh
@@ -85,30 +85,31 @@ function do_build_lib {
     local suffix=$2
     local interface64=$3
     echo "Building with settings: '$plat' '$suffix' '$interface64'"
-    case $plat in
-        x86_64)
+    case $(get_os)-$plat in
+        Linux-x86_64)
             local bitness=64
             local target_flags="TARGET=PRESCOTT"
-            if [ -n "$IS_OSX" ]; then
-                target_flags="TARGET=CORE2"
-            fi
             ;;
-        i686)
+        Darwin-x86_64)
+            local bitness=64
+            local target_flags="TARGET=CORE2"
+            ;;
+        *-i686)
             local bitness=32
             local target_flags="TARGET=PRESCOTT"
             ;;
-        aarch64)
+        Linux-aarch64)
             local bitness=64
             local target_flags="TARGET=ARMV8"
             ;;
-        arm64)
+        Darwin-arm64)
             local bitness=64
             local target_flags="TARGET=VORTEX"
             ;;
-        s390x)
+        *-s390x)
             local bitness=64
             ;;
-        ppc64le)
+        *-ppc64le)
             local bitness=64
             local target_flags="TARGET=POWER8"
             ;;
