Add symlinks of /lib and /lib64 to /usr when building from packages

xtremekforever · xtremekforever · commit 796fc383bd8c · 2025-04-02T19:48:48.000-04:00
- This fixes the issue with the Ubuntu Noble packages not containing /lib64 as other Ubuntu versions do.
diff --git a/Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Download.swift b/Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Download.swift
@@ -147,6 +147,17 @@ extension SwiftSDKGenerator {
         try await fs.unpack(file: tmpDir.appending(fileName), into: sdkDirPath)
       }
     }
+
+    // Make sure we have /lib and /lib64, and if not symlink from /usr
+    // This makes building from packages more consistent with copying from the Docker container
+    let libDirectories = ["lib", "lib64"]
+    for dir in libDirectories {
+      let sdkLibPath = sdkDirPath.appending(dir)
+      let sdkUsrLibPath = sdkDirPath.appending("usr/\(dir)")
+      if !doesFileExist(at: sdkLibPath) && doesFileExist(at: sdkUsrLibPath) {
+        try createSymlink(at: sdkLibPath, pointingTo: FilePath("./usr/\(dir)"))
+      }
+    }
   }
 
   func downloadFiles(

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,17 @@ extension SwiftSDKGenerator {`
`147`	`147`	`try await fs.unpack(file: tmpDir.appending(fileName), into: sdkDirPath)`
`148`	`148`	`}`
`149`	`149`	`}`
	`150`	`+`
	`151`	`+ // Make sure we have /lib and /lib64, and if not symlink from /usr`
	`152`	`+ // This makes building from packages more consistent with copying from the Docker container`
	`153`	`+ let libDirectories = ["lib", "lib64"]`
	`154`	`+ for dir in libDirectories {`
	`155`	`+ let sdkLibPath = sdkDirPath.appending(dir)`
	`156`	`+ let sdkUsrLibPath = sdkDirPath.appending("usr/\(dir)")`
	`157`	`+ if !doesFileExist(at: sdkLibPath) && doesFileExist(at: sdkUsrLibPath) {`
	`158`	`+ try createSymlink(at: sdkLibPath, pointingTo: FilePath("./usr/\(dir)"))`
	`159`	`+ }`
	`160`	`+ }`
`150`	`161`	`}`
`151`	`162`
`152`	`163`	`func downloadFiles(`