# HG changeset patch # User wenzelm # Date 1602610168 -7200 # Node ID 60471f4bafd22681cae567e9689a351dbc952425 # Parent 0822ff79eed8cb209eb5e515aae4292a2ee9a5cd proper library names on Windows; diff -r 0822ff79eed8 -r 60471f4bafd2 src/Pure/Admin/build_csdp.scala --- 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")) } diff -r 0822ff79eed8 -r 60471f4bafd2 src/Pure/Admin/build_polyml.scala --- 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, diff -r 0822ff79eed8 -r 60471f4bafd2 src/Pure/System/executable.scala --- 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 =