# HG changeset patch # User wenzelm # Date 1518350879 -3600 # Node ID c195722c60ac95db87bfefde0adedc5ac1e9d88a # Parent 5efb88c90051a92b3200636565b7398b075370da back to --disable-shared on x86-darwin to avoid odd core-dump of polyimport; diff -r 5efb88c90051 -r c195722c60ac src/Pure/Admin/build_polyml.scala --- a/src/Pure/Admin/build_polyml.scala Sun Feb 11 12:51:23 2018 +0100 +++ b/src/Pure/Admin/build_polyml.scala Sun Feb 11 13:07:59 2018 +0100 @@ -32,7 +32,8 @@ 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 -L/usr/local/lib32"), + "LDFLAGS=-segprot POLY rwx rwx -L/usr/local/lib32", + "--disable-shared"), setup = "PATH=/usr/bin:/bin:/usr/sbin:/sbin"), "x86_64-darwin" -> Platform_Info( @@ -110,10 +111,10 @@ /* configure and make */ val configure_options = + List("--enable-shared", "--enable-intinf-as-int", "--with-gmp") ::: (if (!arch_64 && Isabelle_System.getenv("ISABELLE_PLATFORM64") == "x86_64-linux") info.options_multilib - else info.options) ::: - List("--enable-shared", "--enable-intinf-as-int", "--with-gmp") ::: options + else info.options) ::: options bash(root, info.setup + "\n" +