--- a/src/Pure/Admin/build_csdp.scala Tue Oct 13 19:24:59 2020 +0200
+++ b/src/Pure/Admin/build_csdp.scala Tue Oct 13 19:29:28 2020 +0200
@@ -130,8 +130,8 @@
if (Platform.is_windows) {
Executable.libraries_closure(platform_dir + Path.explode("csdp.exe"), mingw = mingw,
filter =
- Set("libblas", "liblapack", "libgfortran-5", "libgcc_s_seh-1",
- "libquadmath-0", "libwinpthread-1"))
+ Set("libblas", "liblapack", "libgfortran", "libgcc_s_seh",
+ "libquadmath", "libwinpthread"))
}
--- a/src/Pure/Admin/build_polyml.scala Tue Oct 13 19:24:59 2020 +0200
+++ b/src/Pure/Admin/build_polyml.scala Tue Oct 13 19:29:28 2020 +0200
@@ -37,7 +37,7 @@
options =
List("--host=x86_64-w64-mingw32", "CPPFLAGS=-I/mingw64/include", "--disable-windows-gui"),
setup = MinGW.environment_export,
- libs = Set("libgcc_s_seh-1", "libgmp-10", "libstdc++-6", "libwinpthread-1")))
+ libs = Set("libgcc_s_seh", "libgmp", "libstdc++", "libwinpthread")))
def build_polyml(
root: Path,
--- a/src/Pure/System/executable.scala Tue Oct 13 19:24:59 2020 +0200
+++ b/src/Pure/System/executable.scala Tue Oct 13 19:29:28 2020 +0200
@@ -26,7 +26,7 @@
}
def lib_name(lib: String): String =
- Library.take_prefix[Char](_ != '.',
+ Library.take_prefix[Char](c => c != '.' && c != '-',
Library.take_suffix[Char](_ != '/', lib.toList)._2)._1.mkString
val libs =