# HG changeset patch
# User Andreas Lochbihler
# Date 1405958236 -7200
# Node ID b0ad484b7d1c81faabdaf27f27f2dee6fba40181
# Parent  7ef939f89776909629074768da060c40fcfb343f# Parent  ce06a901c05009137f8022f07d8dbcdb84f0b912
merged

diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/afp-poly
--- a/Admin/isatest/settings/afp-poly	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/afp-poly	Mon Jul 21 17:57:16 2014 +0200
@@ -5,7 +5,7 @@
 # to be retired:
 # JINJATHREADS_OPTIONS="-M 1 -q 0 -p 0"
 
-# ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/afp/isabelle-afp-poly
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly-M2
--- a/Admin/isatest/settings/mac-poly-M2	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly-M2	Mon Jul 21 17:57:16 2014 +0200
@@ -9,7 +9,7 @@
 ML_HOME="/home/polyml/polyml-5.5.0/$ML_PLATFORM"
 ML_OPTIONS="-H 500"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-mac-poly-M2
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly-M4
--- a/Admin/isatest/settings/mac-poly-M4	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly-M4	Mon Jul 21 17:57:16 2014 +0200
@@ -8,7 +8,7 @@
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
   ML_OPTIONS="-H 500 --gcthreads 4"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-mac-poly-M4
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly-M8
--- a/Admin/isatest/settings/mac-poly-M8	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly-M8	Mon Jul 21 17:57:16 2014 +0200
@@ -8,7 +8,7 @@
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
   ML_OPTIONS="-H 500 --gcthreads 8"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-mac-poly-M8
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly-M8-quick_and_dirty
--- a/Admin/isatest/settings/mac-poly-M8-quick_and_dirty	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly-M8-quick_and_dirty	Mon Jul 21 17:57:16 2014 +0200
@@ -8,7 +8,7 @@
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
   ML_OPTIONS="-H 1000 --gcthreads 8"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-mac-poly-M8-quick_and_dirty
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly-M8-skip_proofs
--- a/Admin/isatest/settings/mac-poly-M8-skip_proofs	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly-M8-skip_proofs	Mon Jul 21 17:57:16 2014 +0200
@@ -8,7 +8,7 @@
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
   ML_OPTIONS="-H 1000 --gcthreads 8"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-mac-poly-M8-skip_proofs
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly64-M2
--- a/Admin/isatest/settings/mac-poly64-M2	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly64-M2	Mon Jul 21 17:57:16 2014 +0200
@@ -8,7 +8,7 @@
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
   ML_OPTIONS="-H 1000"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-at-mac-poly64-M2
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly64-M4
--- a/Admin/isatest/settings/mac-poly64-M4	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly64-M4	Mon Jul 21 17:57:16 2014 +0200
@@ -8,7 +8,7 @@
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
   ML_OPTIONS="-H 2000 --gcthreads 4"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-mac-poly64-M4
 
diff -r 7ef939f89776 -r b0ad484b7d1c Admin/isatest/settings/mac-poly64-M8
--- a/Admin/isatest/settings/mac-poly64-M8	Mon Jul 21 17:51:29 2014 +0200
+++ b/Admin/isatest/settings/mac-poly64-M8	Mon Jul 21 17:57:16 2014 +0200
@@ -8,7 +8,7 @@
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
   ML_OPTIONS="-H 2000 --gcthreads 8"
 
-#ISABELLE_GHC=/opt/local/bin/ghc
+ISABELLE_GHC=ghc
 
 ISABELLE_HOME_USER=~/isabelle-mac-poly64-M8