# HG changeset patch
# User wenzelm
# Date 1548273933 -3600
# Node ID 55dc07077c6b1e81081fd37bdb7336d79e7f01b7
# Parent  461f0615faa3ab5d9e988773971598a2d1f6f3f3
prefer x86_64_32 over x86;

diff -r 461f0615faa3 -r 55dc07077c6b src/Pure/Admin/build_history.scala
--- a/src/Pure/Admin/build_history.scala	Wed Jan 23 20:45:03 2019 +0100
+++ b/src/Pure/Admin/build_history.scala	Wed Jan 23 21:05:33 2019 +0100
@@ -35,9 +35,10 @@
     {
       val windows_32 = "x86-windows"
       val windows_64 = "x86_64-windows"
+      val windows_64_32 = "x86_64_32-windows"
       val platform_32 = other_isabelle.getenv("ISABELLE_PLATFORM32")
       val platform_64 = other_isabelle.getenv("ISABELLE_PLATFORM64")
-      val platform_family = other_isabelle.getenv("ISABELLE_PLATFORM_FAMILY")
+      val platform_64_32 = platform_64.replace("x86_64-", "x86_64_32-")
 
       val polyml_home =
         try { Path.explode(other_isabelle.getenv("ML_HOME")).dir }
@@ -56,15 +57,15 @@
           if (check_dir(windows_64)) windows_64 else err(windows_64)
         }
         else if (Platform.is_windows && !arch_64) {
-          if (check_dir(windows_32)) windows_32
+          if (check_dir(windows_64_32)) windows_64_32
+          else if (check_dir(windows_32)) windows_32
           else platform_32  // x86-cygwin
         }
-        else {
-          val (platform, platform_name) =
-            if (arch_64) (platform_64, "x86_64-" + platform_family)
-            else (platform_32, "x86-" + platform_family)
-          if (check_dir(platform)) platform else err(platform_name)
+        else if (arch_64) {
+          if (check_dir(platform_64)) platform_64 else err(platform_64)
         }
+        else if (check_dir(platform_64_32)) platform_64_32
+        else platform_32
 
       val ml_options =
         "--minheap " + heap + (if (max_heap.isDefined) " --maxheap " + max_heap.get else "") +