# HG changeset patch
# User wenzelm
# Date 1518349205 -3600
# Node ID 66253039d5caabbf6437e1f1a5e72e5fcb89ddb4
# Parent  6fd9902057f5d5989da8cba08d7bd6b826848d15
enforce shared libpoly on all platforms, with File.copy before File.move;

diff -r 6fd9902057f5 -r 66253039d5ca src/Pure/Admin/build_polyml.scala
--- a/src/Pure/Admin/build_polyml.scala	Sat Feb 10 12:33:45 2018 +0100
+++ b/src/Pure/Admin/build_polyml.scala	Sun Feb 11 12:40:05 2018 +0100
@@ -112,7 +112,7 @@
     val configure_options =
       (if (!arch_64 && Isabelle_System.getenv("ISABELLE_PLATFORM64") == "x86_64-linux")
         info.options_multilib
-       else info.options) ::: List("--enable-intinf-as-int") ::: options
+       else info.options) ::: List("--enable-shared", "--enable-intinf-as-int") ::: options
 
     bash(root,
       info.setup + "\n" +
@@ -129,7 +129,7 @@
     {
       val ldd_pattern =
         if (Platform.is_linux) Some(("ldd", """\s*libgmp.*=>\s*(\S+).*""".r))
-        else if (Platform.is_macos) Some(("otool -L", """\s*(\S+libgmp.*dylib).*""".r))
+        else if (Platform.is_macos) Some(("otool -L", """\s*(\S+lib(?:polyml|gmp).*dylib).*""".r))
         else None
       ldd_pattern match {
         case Some((ldd, pattern)) =>
@@ -159,15 +159,15 @@
     Isabelle_System.rm_tree(target)
     Isabelle_System.mkdirs(target)
 
+    for (file <- info.copy_files ::: ldd_files ::: sha1_files)
+      File.copy(Path.explode(file).expand_env(settings), target)
+
     for {
       d <- List("target/bin", "target/lib")
       dir = root + Path.explode(d)
       entry <- File.read_dir(dir)
     } File.move(dir + Path.explode(entry), target)
 
-    for (file <- info.copy_files ::: ldd_files ::: sha1_files)
-      File.copy(Path.explode(file).expand_env(settings), target)
-
 
     /* poly: library path */