Merge pull request #202 from JohnSundell/remove-static-linking

Make: Don’t statically link standard library
JohnSundell · Apr 12, 2019 · 582505b · 582505b
2 parents cd12e61 + 398ff57
commit 582505b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: generic
 sudo: required
 dist: trusty
 env:
-    - SWIFT_VERSION=4.2
+    - SWIFT_VERSION=5.0
 install:
     - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
 script:

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ install: build install_bin
 
 build:
 	swift package update
-	swift build -c release -Xswiftc -static-stdlib
+	swift build -c release
 
 install_bin:
 	mkdir -p $(PREFIX)/bin

diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/JohnSundell/Files.git",
         "state": {
           "branch": null,
-          "revision": "06f95bd1bf4f8d5f50bc6bb30b808c253acd4c88",
-          "version": "2.2.1"
+          "revision": "a84615f4558151fab52ac38df697ce2442991f93",
+          "version": "2.3.0"
         }
       },
       {

diff --git a/Sources/MarathonCore/Install.swift b/Sources/MarathonCore/Install.swift
@@ -42,11 +42,7 @@ internal class InstallTask: Task, Executable {
         let installPath = makeInstallPath(for: script)
 
         printer.reportProgress("Compiling script...")
-        #if os(Linux)
-            try script.build(withArguments: ["-c", "release"])
-        #else
-            try script.build(withArguments: ["-c", "release", "-Xswiftc", "-static-stdlib"])
-        #endif
+        try script.build(withArguments: ["-c", "release"])
         printer.reportProgress("Installing binary...")
         let installed = try script.install(at: installPath, confirmBeforeOverwriting: !arguments.contains("--force"))