# HG changeset patch # User wenzelm # Date 1478857606 -3600 # Node ID b843bcdd40f0f8d651faf6c6c813ef6876407b64 # Parent d562e173ee0370d7bd3f82e502e47cabc08389d3 more precise environment (for Windows); diff -r d562e173ee03 -r b843bcdd40f0 src/Pure/Admin/build_polyml.scala --- a/src/Pure/Admin/build_polyml.scala Thu Nov 10 23:56:06 2016 +0100 +++ b/src/Pure/Admin/build_polyml.scala Fri Nov 11 10:46:46 2016 +0100 @@ -12,7 +12,7 @@ sealed case class Platform_Info( options: List[String] = Nil, options_multilib: List[String] = Nil, - shell_path: String = "", + setup: String = "", copy_files: List[String] = Nil) private val platform_info = Map( @@ -37,7 +37,7 @@ Platform_Info( options = List("--host=i686-w32-mingw32", "CPPFLAGS=-I/mingw32/include", "--disable-windows-gui"), - shell_path = "/usr/bin:/bin:/mingw32/bin", + setup = "PATH=/usr/bin:/bin:/mingw32/bin", copy_files = List("/mingw32/bin/libgcc_s_dw2-1.dll", "/mingw32/bin/libgmp-10.dll", @@ -46,7 +46,7 @@ Platform_Info( options = List("--host=x86_64-w64-mingw32", "CPPFLAGS=-I/mingw64/include", "--disable-windows-gui"), - shell_path = "/usr/bin:/bin:/mingw64/bin", + setup = "PATH=/usr/bin:/bin:/mingw64/bin", copy_files = List("/mingw64/bin/libgcc_s_seh-1.dll", "/mingw64/bin/libgmp-10.dll", @@ -75,7 +75,7 @@ List("--enable-intinf-as-int") ::: options val script = - (if (info.shell_path == "") "" else "export PATH=\"" + info.shell_path + ":$PATH\"\n") + + info.setup + "\n" + """ [ -f Makefile ] && make distclean { @@ -87,7 +87,7 @@ Isabelle_System.bash( if (other_bash == "") script else Bash.string(other_bash) + " -c " + Bash.string(script), - cwd = source.file, + cwd = source.file, env = null, progress_stdout = progress.echo(_), progress_stderr = progress.echo(_)).check