merged

--- a/src/Pure/Admin/build_history.scala	Wed Nov 07 11:08:12 2018 +0000
+++ b/src/Pure/Admin/build_history.scala	Wed Nov 07 14:06:43 2018 +0100
@@ -205,6 +205,12 @@
           "env PATH=\"" + File.bash_path(Path.explode("~~/lib/dummy_stty").expand) + ":$PATH\" " +
             "bin/isabelle jedit -b", redirect = true, echo = verbose).check
 
+        for {
+          tool <- List("ghc_setup", "ocaml_setup")
+          if other_isabelle.getenv("ISABELLE_" + Word.uppercase(tool)) == "true" &&
+            (other_isabelle.isabelle_home + Path.explode("lib/Tools/" + tool)).is_file
+        } other_isabelle(tool, echo = verbose)
+
         Isabelle_System.rm_tree(isabelle_base_log)
       }
 
@@ -513,8 +519,6 @@
     progress: Progress = No_Progress,
     rev: String = "",
     afp_rev: Option[String] = None,
-    ghc_setup: Boolean = false,
-    ocaml_setup: Boolean = false,
     options: String = "",
     args: String = ""): List[(String, Bytes)] =
   {
@@ -539,10 +543,6 @@
       execute("bin/isabelle", "components -I")
       execute("bin/isabelle", "components -a", echo = true)
       execute("Admin/build", "jars_fresh")
-      for {
-        (setup, tool) <- List((ghc_setup, "ghc_setup"), (ocaml_setup, "ocaml_setup"))
-        if setup && ssh.is_file(Path.explode("lib/Tools/" + tool))
-      } execute("bin/isabelle", tool, echo = true)
     }
 
     val rev_id = self_hg.id(rev)

--- a/src/Pure/Admin/isabelle_cronjob.scala	Wed Nov 07 11:08:12 2018 +0000
+++ b/src/Pure/Admin/isabelle_cronjob.scala	Wed Nov 07 14:06:43 2018 +0100
@@ -159,8 +159,6 @@
     historic: Boolean = false,
     history: Int = 0,
     history_base: String = "build_history_base",
-    ghc_setup: Boolean = false,
-    ocaml_setup: Boolean = false,
     options: String = "",
     args: String = "",
     afp: Boolean = false,
@@ -288,8 +286,8 @@
           detect = Build_Log.Prop.build_start + " > date '2017-03-03'")),
       List(Remote_Build("Mac OS X 10.10 Yosemite", "macbroy31", options = "-m32 -M2", args = "-a")),
       List(Remote_Build("Mac OS X 10.14 Mojave", "lapnipkow3", self_update = true,
-        ghc_setup = true, ocaml_setup = true,
-        options = "-m32 -M1,2", args = "-a -d '~~/src/Benchmarks'")),
+        options = "-m32 -M1,2 -e ISABELLE_GHC_SETUP=true -e ISABELLE_OCAML_SETUP=true",
+        args = "-a -d '~~/src/Benchmarks'")),
       List(
         Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, self_update = true,
           options = "-m32 -M4" +
@@ -350,8 +348,6 @@
                 self_update = r.self_update,
                 rev = rev,
                 afp_rev = afp_rev,
-                ghc_setup = r.ghc_setup,
-                ocaml_setup = r.ocaml_setup,
                 options =
                   " -N " + Bash.string(task_name) + (if (i < 0) "" else "_" + (i + 1).toString) +
                   " -f " + r.options,