Simplify dynamic linking process

shibapm · Oct 7, 2021 · 9046725 · 9046725
1 parent c09f1e7
commit 9046725
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 67 deletions.
diff --git a/Sources/PackageConfig/Package.swift b/Sources/PackageConfig/Package.swift
@@ -11,9 +11,12 @@ enum Package {
         let linkedLibraries = try libraryLinkingArguments()
         var arguments = [String]()
         arguments += ["--driver-mode=swift"] // Eval in swift mode, I think?
-        arguments += getSwiftPMManifestArgs(swiftPath: swiftC) // SwiftPM lib
+        let swiftPMLib = getSwiftPMManifestArgs(swiftPath: swiftC)
+        arguments += swiftPMLib // SwiftPM lib
         arguments += linkedLibraries
         arguments += ["-suppress-warnings"] // SPM does that too
+        arguments += linkDynamicLibrary(path: ".build/debug")
+        arguments += linkDynamicLibrary(path: swiftPMLib[1])
         arguments += ["-sdk"]
         arguments += [findSDKPath()] // Add the SDK on which we need to compile into
         arguments += ["Package.swift"] // The Package.swift in the CWD
@@ -38,71 +41,8 @@ enum Package {
         debugLog("Finished launching swiftc")
     }
 
-    private static func installNameTool(rpath: String, dylib: String?) throws {
-        #if os(Linux)
-        let swiftC = try findPath(tool: "swiftc")
-        #else
-        let swiftC = try runXCRun(tool: "swiftc")
-        #endif
-        let process = Process()
-        let pipe = Pipe()
-
-        process.launchPath = "/usr/bin/install_name_tool"
-        let arguments = ["-change", rpath, dylib ?? (getSwiftPMManifestArgs(swiftPath: swiftC)[1] + "/libPackageDescription.dylib"), "Package"]
-        process.arguments = arguments
-        process.standardOutput = pipe
-
-        debugLog("CMD: \(process.launchPath!) \(arguments.joined(separator: " "))")
-
-        process.launch()
-        process.waitUntilExit()
-
-        debugLog(String(data: pipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)!)
-    }
-
-    static func otool() throws {
-        guard FileManager.default.fileExists(atPath: FileManager.default.currentDirectoryPath + "/Package") else { return }
-
-        let process = Process()
-        let pipe = Pipe()
-
-        process.launchPath = "/usr/bin/otool"
-        let arguments = ["-L", "Package"]
-        process.arguments = arguments
-        process.standardOutput = pipe
-
-        debugLog("CMD: \(process.launchPath!) \(arguments.joined(separator: " "))")
-
-        process.launch()
-        process.waitUntilExit()
-
-        let output = String(data: pipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)!
-
-        let lines = output.trimmingCharacters(in: .whitespacesAndNewlines).replacingOccurrences(of: "\t", with: "").split(separator: "\n")
-        let missingLinks = lines.filter { $0.starts(with: "@rpath") }
-
-        if let packageDescription = missingLinks.filter({ $0.contains("libPackageDescription") }).first {
-            try installNameTool(rpath: String(packageDescription.split(separator: " ").first!), dylib: nil)
-        }
-
-        for missingLink in missingLinks.filter({ !$0.contains("libPackageDescription") }) {
-            try installNameTool(rpath: String(missingLink.split(separator: " ").first!), dylib: ".build/debug/\(missingLink.split(separator: " ").first!.replacingOccurrences(of: "@rpath/", with: ""))")
-        }
-
-        let resultProcess = Process()
-        let resultPipe = Pipe()
-
-        resultProcess.launchPath = "/usr/bin/otool"
-        let resultArguments = ["-L", "Package"]
-        resultProcess.arguments = resultArguments
-        resultProcess.standardOutput = resultPipe
-
-        debugLog("CMD: \(process.launchPath!) \(arguments.joined(separator: " "))")
-
-        resultProcess.launch()
-        resultProcess.waitUntilExit()
-
-        debugLog(String(data: resultPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)!)
+    private static func linkDynamicLibrary(path: String) -> [String] {
+        ["-Xlinker", "-rpath", "-Xlinker", path]
     }
 
     static func runIfNeeded() throws {

diff --git a/Sources/PackageConfig/PackageConfig.swift b/Sources/PackageConfig/PackageConfig.swift
@@ -11,7 +11,6 @@ extension PackageConfig {
 
 	public static func load() throws -> Self {
 		try Package.compile()
-        try Package.otool()
         try Package.runIfNeeded()
 		return try Loader.load()
 	}