diff -r 38c89353b349 -r 2026ef279d1e Admin/isatest/settings/mac-poly64-M2
--- a/Admin/isatest/settings/mac-poly64-M2	Sun Feb 28 17:40:01 2016 +0100
+++ b/Admin/isatest/settings/mac-poly64-M2	Sun Feb 28 19:54:18 2016 +0100
@@ -1,12 +1,12 @@
 # -*- shell-script -*- :mode=shellscript:
 
 init_components /home/isabelle/contrib "$HOME/admin/components/main"
+init_components /home/isabelle/contrib "$HOME/admin/components/optional"
+init_components /home/isabelle/contrib "$HOME/admin/components/nonfree"
 
-  POLYML_HOME="/home/polyml/polyml-5.5.0"
-  ML_SYSTEM="polyml-5.5.0"
-  ML_PLATFORM="x86_64-darwin"
-  ML_HOME="$POLYML_HOME/$ML_PLATFORM"
-  ML_OPTIONS="-H 1000"
+ML_PLATFORM="$ISABELLE_PLATFORM64"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
+ML_OPTIONS="-H 2000 --gcthreads 2"
 
 ISABELLE_GHC=ghc
 
@@ -27,4 +27,3 @@
 ISABELLE_BROWSER_INFO="$ISABELLE_HOME_USER/browser_info"
 
 ISABELLE_BUILD_OPTIONS="browser_info=false document=false threads=2 parallel_proofs=2"
-