updated platform situation: 32bit variants are marginal or absent;
authorwenzelm
Mon, 23 Dec 2019 22:24:28 +0100
changeset 71551 d72d4a9316c9
parent 71550 dfc52eb97ff4
child 71552 7a53175fb0f4
updated platform situation: 32bit variants are marginal or absent;
lib/scripts/getsettings
lib/scripts/isabelle-platform
--- a/lib/scripts/getsettings	Mon Dec 23 22:08:20 2019 +0100
+++ b/lib/scripts/getsettings	Mon Dec 23 22:24:28 2019 +0100
@@ -60,7 +60,7 @@
 
 #platform
 source "$ISABELLE_HOME/lib/scripts/isabelle-platform"
-if [ -z "$ISABELLE_PLATFORM" ]; then
+if [ -z "$ISABELLE_PLATFORM32" -a -z "$ISABELLE_PLATFORM64" ]; then
   echo 1>&2 "Failed to determine hardware and operating system type!"
   exit 2
 fi
--- a/lib/scripts/isabelle-platform	Mon Dec 23 22:08:20 2019 +0100
+++ b/lib/scripts/isabelle-platform	Mon Dec 23 22:24:28 2019 +0100
@@ -12,39 +12,25 @@
 case $(uname -s) in
   Linux)
     ISABELLE_PLATFORM_FAMILY="linux"
-    case $(uname -m) in
-      i?86)
-        ISABELLE_PLATFORM32=x86-linux
-        ;;
-      x86_64)
-        ISABELLE_PLATFORM32=x86-linux
-        ISABELLE_PLATFORM64=x86_64-linux
-        ;;
-    esac
+    ISABELLE_PLATFORM32=x86-linux
+    ISABELLE_PLATFORM64=x86_64-linux
     ;;
   Darwin)
     ISABELLE_PLATFORM_FAMILY="macos"
-    case $(uname -m) in
-      i?86)
+    case $(sw_vers -productVersion) in
+      10.10*|10.11*|10.12*|10.13*|10.14*)
         ISABELLE_PLATFORM32=x86-darwin
-        if [ "$(sysctl -n hw.optional.x86_64 2>/dev/null)" = 1 ]; then
-          ISABELLE_PLATFORM64=x86_64-darwin
-        fi
+        ISABELLE_PLATFORM64=x86_64-darwin
         ;;
-      x86_64)
-        ISABELLE_PLATFORM32=x86-darwin
+      *)
         ISABELLE_PLATFORM64=x86_64-darwin
         ;;
     esac
     ;;
   CYGWIN_NT*)
     ISABELLE_PLATFORM_FAMILY="windows"
-    if [ "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64" ]; then
-      ISABELLE_WINDOWS_PLATFORM32="x86-windows"
-      ISABELLE_WINDOWS_PLATFORM64="x86_64-windows"
-    else
-      ISABELLE_WINDOWS_PLATFORM32="x86-windows"
-    fi
+    ISABELLE_WINDOWS_PLATFORM32="x86-windows"
+    ISABELLE_WINDOWS_PLATFORM64="x86_64-windows"
     case $(uname -m) in
       x86_64)
         ISABELLE_PLATFORM64=x86_64-cygwin
@@ -55,6 +41,3 @@
     esac
     ;;
 esac
-
-ISABELLE_PLATFORM="${ISABELLE_PLATFORM32:-$ISABELLE_PLATFORM64}"
-ISABELLE_WINDOWS_PLATFORM="${ISABELLE_WINDOWS_PLATFORM32:-$ISABELLE_WINDOWS_PLATFORM64}"