diff --git a/src/Pure/Admin/build_csdp.scala b/src/Pure/Admin/build_csdp.scala
--- a/src/Pure/Admin/build_csdp.scala
+++ b/src/Pure/Admin/build_csdp.scala
@@ -1,207 +1,207 @@
 /*  Title:      Pure/Admin/build_csdp.scala
     Author:     Makarius
 
 Build Isabelle CSDP component from official download.
 */
 
 package isabelle
 
 
 object Build_CSDP
 {
   // Note: version 6.2.0 does not quite work for the "sos" proof method
   val default_download_url = "https://github.com/coin-or/Csdp/archive/releases/6.1.1.tar.gz"
 
 
   /* flags */
 
   sealed case class Flags(platform: String, CFLAGS: String = "", LIBS: String = "")
   {
     val changed: List[(String, String)] =
       List("CFLAGS" -> CFLAGS, "LIBS" -> LIBS).filter(p => p._2.nonEmpty)
 
     def print: Option[String] =
       if (changed.isEmpty) None
       else
         Some("  * " + platform + ":\n" + changed.map(p => "    " + p._1 + "=" + p._2)
           .mkString("\n"))
 
     def change(path: Path)
     {
       def change_line(line: String, entry: (String, String)): String =
         line.replaceAll(entry._1 + "=.*", entry._1 + "=" + entry._2)
       File.change(path, s =>
         split_lines(s).map(line => (line /: changed)(change_line)).mkString("\n"))
     }
   }
 
   val build_flags: List[Flags] =
     List(
       Flags("arm64-linux",
         CFLAGS = "-O3 -ansi -Wall -DNOSHORTS -DBIT64 -DUSESIGTERM -DUSEGETTIME -I../include",
         LIBS = "-static -L../lib -lsdp -llapack -lblas -lgfortran -lm"),
       Flags("x86_64-linux",
         CFLAGS = "-O3 -ansi -Wall -DNOSHORTS -DBIT64 -DUSESIGTERM -DUSEGETTIME -I../include",
         LIBS = "-static -L../lib -lsdp -llapack -lblas -lgfortran -lquadmath -lm"),
       Flags("x86_64-darwin",
         CFLAGS = "-O3 -Wall -DNOSHORTS -DBIT64 -DUSESIGTERM -DUSEGETTIME -I../include",
         LIBS = "-L../lib -lsdp -llapack -lblas -lm"),
       Flags("x86_64-windows"))
 
 
   /* build CSDP */
 
   def build_csdp(
     download_url: String = default_download_url,
     verbose: Boolean = false,
     progress: Progress = new Progress,
     target_dir: Path = Path.current,
     mingw: MinGW = MinGW.none)
   {
     mingw.check
 
     Isabelle_System.with_tmp_dir("build")(tmp_dir =>
     {
       /* component */
 
       val Archive_Name = """^.*?([^/]+)$""".r
       val Version = """^[^0-9]*([0-9].*)\.tar.gz$""".r
 
       val archive_name =
         download_url match {
           case Archive_Name(name) => name
           case _ => error("Failed to determine source archive name from " + quote(download_url))
         }
 
       val version =
         archive_name match {
           case Version(version) => version
           case _ => error("Failed to determine component version from " + quote(archive_name))
         }
 
       val component_name = "csdp-" + version
       val component_dir = Isabelle_System.new_directory(target_dir + Path.basic(component_name))
       progress.echo("Component " + component_dir)
 
 
       /* platform */
 
       val platform_name =
         proper_string(Isabelle_System.getenv("ISABELLE_WINDOWS_PLATFORM64")) orElse
         proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse
         error("No 64bit platform")
 
       val platform_dir = Isabelle_System.make_directory(component_dir + Path.basic(platform_name))
 
 
       /* download source */
 
       val archive_path = tmp_dir + Path.basic(archive_name)
       Isabelle_System.download(download_url, archive_path, progress = progress)
 
       Isabelle_System.bash("tar xzf " + File.bash_path(archive_path), cwd = tmp_dir.file).check
       val source_name = File.get_dir(tmp_dir)
 
       Isabelle_System.bash(
         "tar xzf " + archive_path + " && mv " + Bash.string(source_name) + " src",
         cwd = component_dir.file).check
 
 
       /* build */
 
       progress.echo("Building CSDP for " + platform_name + " ...")
 
       val build_dir = tmp_dir + Path.basic(source_name)
       build_flags.find(flags => flags.platform == platform_name) match {
         case None => error("No build flags for platform " + quote(platform_name))
         case Some(flags) =>
           File.find_files(build_dir.file, pred = file => file.getName == "Makefile").
             foreach(file => flags.change(File.path(file)))
       }
 
       progress.bash(mingw.bash_script("make"), cwd = build_dir.file, echo = verbose).check
 
 
       /* install */
 
       File.copy(build_dir + Path.explode("LICENSE"), component_dir)
       File.copy(build_dir + Path.explode("solver/csdp").platform_exe, platform_dir)
 
       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"))
       }
 
 
       /* settings */
 
       val etc_dir = Isabelle_System.make_directory(component_dir + Path.basic("etc"))
       File.write(etc_dir + Path.basic("settings"),
         """# -*- shell-script -*- :mode=shellscript:
 
 ISABELLE_CSDP="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-$ISABELLE_PLATFORM64}/csdp"
 """)
 
 
       /* README */
 
       File.write(component_dir + Path.basic("README"),
 """This is CSDP """ + version + """ from
 """ + download_url + """
 
 Makefile flags have been changed for various platforms as follows:
 
 """ + build_flags.flatMap(_.print).mkString("\n\n") + """
 
 The distribution has been built like this:
 
     cd src && make
 
 Only the bare "solver/csdp" program is used for Isabelle.
 
 
         Makarius
         """ + Date.Format.date(Date.now()) + "\n")
     })
 }
 
 
   /* Isabelle tool wrapper */
 
   val isabelle_tool =
     Isabelle_Tool("build_csdp", "build prover component from official download",
     args =>
     {
       var target_dir = Path.current
       var mingw = MinGW.none
       var download_url = default_download_url
       var verbose = false
 
       val getopts = Getopts("""
 Usage: isabelle build_csdp [OPTIONS]
 
   Options are:
     -D DIR       target directory (default ".")
     -M DIR       msys/mingw root specification for Windows
     -U URL       download URL
                  (default: """" + default_download_url + """")
     -v           verbose
 
   Build prover component from official download.
 """,
         "D:" -> (arg => target_dir = Path.explode(arg)),
         "M:" -> (arg => mingw = MinGW(Path.explode(arg))),
         "U:" -> (arg => download_url = arg),
         "v" -> (_ => verbose = true))
 
       val more_args = getopts(args)
       if (more_args.nonEmpty) getopts.usage()
 
       val progress = new Console_Progress()
 
       build_csdp(download_url = download_url, verbose = verbose, progress = progress,
         target_dir = target_dir, mingw = mingw)
     })
 }
diff --git a/src/Pure/Admin/build_polyml.scala b/src/Pure/Admin/build_polyml.scala
--- a/src/Pure/Admin/build_polyml.scala
+++ b/src/Pure/Admin/build_polyml.scala
@@ -1,269 +1,269 @@
 /*  Title:      Pure/Admin/build_polyml.scala
     Author:     Makarius
 
 Build Poly/ML from sources.
 */
 
 package isabelle
 
 
 import scala.util.matching.Regex
 
 
 object Build_PolyML
 {
   /** platform-specific build **/
 
   sealed case class Platform_Info(
     options: List[String] = Nil,
     setup: String = "",
     libs: Set[String] = Set.empty)
 
   private val platform_info = Map(
     "linux" ->
       Platform_Info(
         options = List("LDFLAGS=-Wl,-rpath,_DUMMY_"),
         libs = Set("libgmp")),
     "darwin" ->
       Platform_Info(
         options =
           List("--build=x86_64-darwin", "CFLAGS=-arch x86_64 -O3 -I../libffi/include",
             "CXXFLAGS=-arch x86_64 -O3 -I../libffi/include", "CCASFLAGS=-arch x86_64",
             "LDFLAGS=-segprot POLY rwx rwx"),
         setup = "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
         libs = Set("libpolyml", "libgmp")),
     "windows" ->
       Platform_Info(
         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,
     sha1_root: Option[Path] = None,
     progress: Progress = new Progress,
     arch_64: Boolean = false,
     options: List[String] = Nil,
     mingw: MinGW = MinGW.none)
   {
     if (!((root + Path.explode("configure")).is_file && (root + Path.explode("PolyML")).is_dir))
       error("Bad Poly/ML root directory: " + root)
 
     val platform = Isabelle_Platform.self
     val platform_arch =
       if (arch_64) platform.arch_64
       else if (platform.is_intel) "x86_64_32"
       else platform.arch_32
 
     val polyml_platform = platform_arch + "-" + platform.os_name
     val sha1_platform = platform.arch_64 + "-" + platform.os_name
 
     val info =
       platform_info.getOrElse(platform.os_name,
         error("Bad OS platform: " + quote(platform.os_name)))
 
     if (platform.is_linux) Isabelle_System.require_command("chrpath")
 
 
     /* bash */
 
     def bash(
       cwd: Path, script: String, redirect: Boolean = false, echo: Boolean = false): Process_Result =
     {
       progress.bash(mingw.bash_script(script), cwd = cwd.file, redirect = redirect, echo = echo)
     }
 
 
     /* configure and make */
 
     val configure_options =
       List("--disable-shared", "--enable-intinf-as-int", "--with-gmp") :::
         info.options ::: options ::: (if (arch_64) Nil else List("--enable-compact32bit"))
 
     bash(root,
       info.setup + "\n" +
       """
         [ -f Makefile ] && make distclean
         {
           ./configure --prefix="$PWD/target" """ + Bash.strings(configure_options) + """
           rm -rf target
           make compiler && make compiler && make install
         } || { echo "Build failed" >&2; exit 2; }
       """, redirect = true, echo = true).check
 
     Executable.libraries_closure(
       root + Path.explode("target/bin/poly"), mingw = mingw, filter = info.libs)
 
 
     /* sha1 library */
 
     val sha1_files =
       if (sha1_root.isDefined) {
         val dir1 = sha1_root.get
         bash(dir1, "./build " + sha1_platform, redirect = true, echo = true).check
 
         val dir2 = dir1 + Path.explode(sha1_platform)
         File.read_dir(dir2).map(entry => dir2 + Path.basic(entry))
       }
       else Nil
 
 
     /* install */
 
     val platform_dir = Path.explode(polyml_platform)
     Isabelle_System.rm_tree(platform_dir)
     Isabelle_System.make_directory(platform_dir)
 
     for (file <- sha1_files) File.copy(file, platform_dir)
 
     for {
       d <- List("target/bin", "target/lib")
       dir = root + Path.explode(d)
       entry <- File.read_dir(dir)
     } File.move(dir + Path.explode(entry), platform_dir)
 
 
     /* polyc: directory prefix */
 
     val Header = "#! */bin/sh".r
     File.change(platform_dir + Path.explode("polyc"), txt =>
       split_lines(txt) match {
         case Header() :: lines =>
           val lines1 =
             lines.map(line =>
               if (line.startsWith("prefix=")) "prefix=\"$(cd \"$(dirname \"$0\")\"; pwd)\""
               else if (line.startsWith("BINDIR=")) "BINDIR=\"$prefix\""
               else if (line.startsWith("LIBDIR=")) "LIBDIR=\"$prefix\""
               else line)
           cat_lines("#!/usr/bin/env bash" ::lines1)
         case lines =>
           error(cat_lines("Cannot patch polyc -- undetected header:" :: lines.take(3)))
       }
     )
   }
 
 
 
   /** skeleton for component **/
 
   private def extract_sources(source_archive: Path, component_dir: Path) =
   {
     if (source_archive.get_ext == "zip") {
       Isabelle_System.bash(
         "unzip -x " + File.bash_path(source_archive.absolute), cwd = component_dir.file).check
     }
     else {
       Isabelle_System.gnutar("-xzf " + File.bash_path(source_archive), dir = component_dir).check
     }
 
     val src_dir = component_dir + Path.explode("src")
     File.read_dir(component_dir) match {
       case List(s) => File.move(component_dir + Path.basic(s), src_dir)
       case _ => error("Source archive contains multiple directories")
     }
 
     val lines = split_lines(File.read(src_dir + Path.explode("RootX86.ML")))
     val ml_files =
       for {
         line <- lines
         rest <- Library.try_unprefix("use", line)
       } yield "ML_file" + rest
 
     File.write(src_dir + Path.explode("ROOT.ML"),
 """(* Poly/ML Compiler root file.
 
 When this file is open in the Prover IDE, the ML files of the Poly/ML
 compiler can be explored interactively. This is a separate copy: it does
 not affect the running ML session. *)
 """ + ml_files.mkString("\n", "\n", "\n"))
   }
 
   def build_polyml_component(
     source_archive: Path,
     component_dir: Path,
     sha1_root: Option[Path] = None)
   {
     Isabelle_System.new_directory(component_dir)
     extract_sources(source_archive, component_dir)
 
     File.copy(Path.explode("~~/Admin/polyml/README"), component_dir)
 
     val etc_dir = Isabelle_System.make_directory(component_dir + Path.explode("etc"))
     File.copy(Path.explode("~~/Admin/polyml/settings"), etc_dir)
 
     sha1_root match {
       case Some(dir) =>
         Mercurial.repository(dir).archive(File.standard_path(component_dir + Path.explode("sha1")))
       case None =>
     }
   }
 
 
 
   /** Isabelle tool wrappers **/
 
   val isabelle_tool1 =
     Isabelle_Tool("build_polyml", "build Poly/ML from sources", args =>
     {
       var mingw = MinGW.none
       var arch_64 = Isabelle_Platform.self.is_arm
       var sha1_root: Option[Path] = None
 
       val getopts = Getopts("""
 Usage: isabelle build_polyml [OPTIONS] ROOT [CONFIGURE_OPTIONS]
 
   Options are:
     -M DIR       msys/mingw root specification for Windows
     -m ARCH      processor architecture (32 or 64, default: """ +
         (if (arch_64) "64" else "32") + """)
     -s DIR       sha1 sources, see https://isabelle.sketis.net/repos/sha1
 
   Build Poly/ML in the ROOT directory of its sources, with additional
   CONFIGURE_OPTIONS (e.g. --without-gmp).
 """,
         "M:" -> (arg => mingw = MinGW(Path.explode(arg))),
         "m:" ->
           {
             case "32" => arch_64 = false
             case "64" => arch_64 = true
             case bad => error("Bad processor architecture: " + quote(bad))
           },
         "s:" -> (arg => sha1_root = Some(Path.explode(arg))))
 
       val more_args = getopts(args)
       val (root, options) =
         more_args match {
           case root :: options => (Path.explode(root), options)
           case Nil => getopts.usage()
         }
       build_polyml(root, sha1_root = sha1_root, progress = new Console_Progress,
         arch_64 = arch_64, options = options, mingw = mingw)
     })
 
   val isabelle_tool2 =
     Isabelle_Tool("build_polyml_component", "make skeleton for Poly/ML component", args =>
     {
       var sha1_root: Option[Path] = None
 
       val getopts = Getopts("""
 Usage: isabelle build_polyml_component [OPTIONS] SOURCE_ARCHIVE COMPONENT_DIR
 
   Options are:
     -s DIR       sha1 sources, see https://isabelle.sketis.net/repos/sha1
 
   Make skeleton for Poly/ML component, based on official source archive
   (zip or tar.gz).
 """,
         "s:" -> (arg => sha1_root = Some(Path.explode(arg))))
 
       val more_args = getopts(args)
 
       val (source_archive, component_dir) =
         more_args match {
           case List(archive, dir) => (Path.explode(archive), Path.explode(dir))
           case _ => getopts.usage()
         }
       build_polyml_component(source_archive, component_dir, sha1_root = sha1_root)
     })
 }
diff --git a/src/Pure/System/executable.scala b/src/Pure/System/executable.scala
--- a/src/Pure/System/executable.scala
+++ b/src/Pure/System/executable.scala
@@ -1,78 +1,78 @@
 /*  Title:      Pure/System/executable.scala
     Author:     Makarius
 
 Support for platform-specific executables.
 */
 
 package isabelle
 
 
 object Executable
 {
   def libraries_closure(path: Path,
     mingw: MinGW = MinGW.none,
     filter: String => Boolean = _ => true,
     patchelf: Boolean = false): List[String] =
   {
     val exe_path = path.expand
     val exe_dir = exe_path.dir
     val exe = exe_path.base
 
     val ldd_lines =
     {
       val ldd = if (Platform.is_macos) "otool -L" else "ldd"
       val script = mingw.bash_script(ldd + " " + File.bash_path(exe))
       Library.split_lines(Isabelle_System.bash(script, cwd = exe_dir.file).check.out)
     }
 
     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 =
       if (Platform.is_macos) {
         val Pattern = """^\s*(/.+)\s+\(.*\)$""".r
         for {
           Pattern(lib) <- ldd_lines
           if !lib.startsWith("@executable_path/") && filter(lib_name(lib))
         } yield lib
       }
       else {
         val Pattern = """^.*=>\s*(/.+)\s+\(.*\)$""".r
         val prefix =
           mingw.root match {
             case None => ""
             case Some(path) => path.absolute.implode
           }
         for { Pattern(lib) <- ldd_lines if filter(lib_name(lib)) }
           yield prefix + lib
       }
 
     if (libs.nonEmpty) {
       libs.foreach(lib => File.copy(Path.explode(lib), exe_dir))
 
       if (Platform.is_linux) {
         if (patchelf) {
           // requires e.g. Ubuntu 16.04 LTS
           Isabelle_System.require_command("patchelf")
           Isabelle_System.bash("patchelf --force-rpath --set-rpath '$ORIGIN' " + File.bash_path(exe_path)).check
         }
         else {
           // requires e.g. LDFLAGS=-Wl,-rpath,_DUMMY_
           Isabelle_System.require_command("chrpath")
           Isabelle_System.bash("chrpath -r '$ORIGIN' " + File.bash_path(exe_path)).check
         }
       }
       else if (Platform.is_macos) {
         val script =
           ("install_name_tool" ::
             libs.map(file => "-change " + Bash.string(file) + " " +
               Bash.string("@executable_path/" + Path.explode(file).file_name) + " " +
               File.bash_path(exe))).mkString(" ")
         Isabelle_System.bash(script, cwd = exe_dir.file).check
       }
     }
 
     libs
   }
 }