no message

Author: daveinglis

Sources/SWBCore/SpecImplementations/LinkerSpec.swift

@@ -95,7 +95,6 @@ open class LinkerSpec : CommandLineToolSpec, @unchecked Sendable {
             self.kind = kind
             self.path = path
             self.mode = mode
-            self.useSearchPaths = useSearchPaths
             self.swiftModulePaths = swiftModulePaths
             self.swiftModuleAdditionalLinkerArgResponseFilePaths = swiftModuleAdditionalLinkerArgResponseFilePaths
             self.explicitDependencies = explicitDependencies
@@ -104,6 +103,9 @@ open class LinkerSpec : CommandLineToolSpec, @unchecked Sendable {
             self.xcframeworkSourcePath = xcframeworkSourcePath
             self.privacyFile = privacyFile
             self.libPrefix = prefixes.first
+            // Only use search paths when no prefix is required or when the prefix matches
+            let hasValidPrefix = libPrefix.map { path.basename.hasPrefix($0) } ?? true
+            self.useSearchPaths = hasValidPrefix && useSearchPaths
         }
     }
 

Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift

@@ -1292,10 +1292,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
             switch specifier.kind {
             case .static, .dynamic, .textBased, .framework:
                 if specifier.useSearchPaths {
-                    let args = specifier.searchPathFlagsForLd()
-                    if !args.isEmpty { // no search args, fallback to absolute path to library
-                        return (args, [])
-                    }
+                    return (specifier.searchPathFlagsForLd(), [])
                 }
                 return (specifier.absolutePathFlagsForLd(), [specifier.path])
             case .object:
@@ -1533,15 +1530,18 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
 
 /// Extensions to `LinkerSpec.LibrarySpecifier` specific to the dynamic linker.
 fileprivate extension LinkerSpec.LibrarySpecifier {
+
     func searchPathFlagsForLd() -> [String] {
+        precondition(useSearchPaths)
+        // Extract basename once to avoid redundant operations
+        let basename = path.basename
+        let basenameWithoutSuffix = Path(basename).withoutSuffix
+        // Strip the prefix if one exists and is present in the basename
         let strippedName: String
-        if let prefix = libPrefix, path.basename.hasPrefix(prefix) {
-            strippedName = Path(path.basename).withoutSuffix.withoutPrefix(prefix)
+        if let prefix = libPrefix, basename.hasPrefix(prefix) {
+            strippedName = basenameWithoutSuffix.withoutPrefix(prefix)
         } else {
-            if libPrefix != nil { // we need a prefix for linking with search paths
-                return [] // this will fallback to using absolute paths
-            }
-            strippedName = Path(path.basename).withoutSuffix
+            strippedName = basenameWithoutSuffix
         }
         switch (kind, mode) {
         case (.dynamic, .normal):