# HG changeset patch
# User wenzelm
# Date 1518261618 -3600
# Node ID 085f5c2e11f7f4b77e5b3a073aa176a4acfc3a58
# Parent  f3a68e350ab6022ff8fa9e5b6349e71656642396
support for libgmp for x86-darwin;

diff -r f3a68e350ab6 -r 085f5c2e11f7 Admin/polyml/README
--- a/Admin/polyml/README	Sat Feb 10 11:55:12 2018 +0100
+++ b/Admin/polyml/README	Sat Feb 10 12:20:18 2018 +0100
@@ -19,18 +19,35 @@
 
 * Mac OS X:
 
-  $ isabelle build_polyml -m32 -s sha1 src --without-gmp
+  $ isabelle build_polyml -m32 -s sha1 src --with-gmp
   $ isabelle build_polyml -m64 -s sha1 src --with-gmp
 
-  The latter is based on libgmp for x86_64-darwin:
+
+Building libgmp on Mac OS X
+===========================
+
+The GNU Multiple Precision Arithmetic Library is not included in Mac OS X
+by default, but it can be built from sources as follows.
+
+* Download:
+
+  $ curl https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz | xz -dc | tar xf -
+  $ cd gmp-6.1.2
 
-  curl https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz | xz -dc | tar xf -
-  cd gmp-6.1.2
-  ./configure --enable-cxx --build=core2-apple-darwin"$(uname -r)"
-  make
-  make check
-  make install
+* build x86-darwin:
+
+  $ make distclean
+  $ env ABI=32 ./configure --enable-cxx --build=core2-apple-darwin"$(uname -r)" --libdir=/usr/local/lib32
+  $ make && make check
+  $ sudo make install
+
+* build x86_64-darwin:
+
+  $ make distclean
+  $ ./configure --enable-cxx --build=core2-apple-darwin"$(uname -r)"
+  $ make && make check
+  $ sudo make install
 
 
         Makarius
-        09-Feb-2018
+        10-Feb-2018
diff -r f3a68e350ab6 -r 085f5c2e11f7 src/Pure/Admin/build_polyml.scala
--- a/src/Pure/Admin/build_polyml.scala	Sat Feb 10 11:55:12 2018 +0100
+++ b/src/Pure/Admin/build_polyml.scala	Sat Feb 10 12:20:18 2018 +0100
@@ -32,7 +32,7 @@
         options =
           List("--build=i686-darwin", "CFLAGS=-arch i686 -O3 -I../libffi/include",
             "CXXFLAGS=-arch i686 -O3 -I../libffi/include", "CCASFLAGS=-arch i686 -O3",
-            "LDFLAGS=-segprot POLY rwx rwx"),
+            "LDFLAGS=-segprot POLY rwx rwx -L/usr/local/lib32"),
         setup = "PATH=/usr/bin:/bin:/usr/sbin:/sbin"),
     "x86_64-darwin" ->
       Platform_Info(