updates

Author: bkhouri

Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift

@@ -368,7 +368,7 @@ public final class LdLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @unchec
             && cbc.producer.platform?.minimumOSForSwiftInTheOS != nil {
             // NOTE: For swift.org toolchains, this is fine as `DYLD_LIBRARY_PATH` is used to override these settings.
             let swiftABIVersion =  await (cbc.producer.swiftCompilerSpec.discoveredCommandLineToolSpecInfo(cbc.producer, cbc.scope, delegate) as? DiscoveredSwiftCompilerToolSpecInfo)?.swiftABIVersion
-            runpathSearchPaths.insert( swiftABIVersion.flatMap { "/usr/lib/swift-\($0)" } ?? "/usr/lib/swift_static", at: 0)
+            runpathSearchPaths.insert( swiftABIVersion.flatMap { "/usr/lib/swift-\($0)" } ?? "/usr/lib/swift", at: 0)
             // Ensure the linker driver does not insert a duplicate rpath (if linking using swiftc)
             suppressDriverStdlibPaths = true
         }

Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift

@@ -3062,18 +3062,14 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         if !forTAPI {
             if shouldStaticLinkStdlib {
                 // Platform-specific static linking flags
-                // args += [["-Xlinker", "$(LD_FORCE_STATIC_LINK_STDLIB)"]]
                 if producer.isApplePlatform {
                     // Darwin/Apple platforms use force_load_swift_libs and Framework linking
                     args += [["-Xlinker", "-force_load_swift_libs"]]
                     args += [["-lc++", "-framework", "Foundation"]]
                 } else {
                     // Non-Apple platforms (Linux, etc.) use static library linking
-                    // args += [["-lc++", "-framework", "Foundation"]]
-                    // args += [["-lc++"]]
-                    args += [["-static-stdlib"]]
-                    // args += [["-Xlinker", "-no-pie"]]
                     // Note: Foundation is not available as a framework on non-Apple platforms
+                    args += [["-static-stdlib", ]]
                 }
             }