updates

Author: bkhouri

Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift

@@ -2961,10 +2961,8 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         // NOTE: With Swift in the OS, static libs aren't being supplied by the toolchains
         //       so users of this flag will need to provide their own.
         if scope.evaluate(BuiltinMacros.SWIFT_FORCE_STATIC_LINK_STDLIB, lookup: lookup) {
-            print("staticallyLinkSwiftStdlib: true")
             return true
         }
-        print("staticallyLinkSwiftStdlib: false")
         return false
     }
 
@@ -3003,24 +3001,19 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
         if swiftLibraryPath.isEmpty {
             // Look next to the compiler and in the toolchains for one.
             if shouldStaticLinkStdlib {
-                print("Finding static lib search paths")
                 swiftLibraryPath = findSearchPathForLibrary(executablePath: swiftc, possibleNames: [
                         "swift_static/\(platformName)/lib\(swiftStdlibName).a",
                         "swift_static/lib\(swiftStdlibName).a",
                         "lib\(swiftStdlibName).a",
                     ], toolchains: producer.toolchains) ?? Path("")
             } else {
-                print("Finding dynamiclib search paths")
                 swiftLibraryPath = findSearchPathForLibrary(executablePath: swiftc, possibleNames: [
                         "swift/\(platformName)/lib\(swiftStdlibName).\(dynamicLibraryExtension)",
                         "swift/lib\(swiftStdlibName).\(dynamicLibraryExtension)",
                         "lib\(swiftStdlibName).\(dynamicLibraryExtension)",
                     ], toolchains: producer.toolchains) ?? Path("")
             }
-        } else {
-            print("swiftLibraryPath is not empty.")
         }
-        print("********** swiftLibraryPath are: \(swiftLibraryPath)")
 
         let isMacCatalystUnzippered = producer.sdkVariant?.isMacCatalyst == true && !scope.evaluate(BuiltinMacros.IS_ZIPPERED, lookup: lookup)
 
@@ -3030,12 +3023,12 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             // TAPI requires absolute paths.
             let sdkroot = scope.evaluate(BuiltinMacros.SDKROOT, lookup: lookup)
             if !sdkroot.isEmpty {
-                sdkPathArgument = ["-L" + sdkroot.join("usr/lib/swift_static").str]
+                sdkPathArgument = ["-L" + sdkroot.join("usr/lib/swift").str]
                 unzipperedSDKPathArgument = ["-L" + sdkroot.join("System/iOSSupport/usr/lib/swift").str]
             }
         } else {
             // ld prefers SDK relative paths.
-            sdkPathArgument = ["-L/usr/lib/swift_static"]
+            sdkPathArgument = ["-L/usr/lib/swift"]
             unzipperedSDKPathArgument = ["-L/System/iOSSupport/usr/lib/swift"]
         }
 
@@ -3046,7 +3039,6 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
             }
 
             args += [sdkPathArgument]
-            print("**** SDK Parth arguments: \(sdkPathArgument)")
         }
 
         // Add the -L to the standard library path. This is used primarily for the OSS toolchain now as each of the libs have been moved into the Swift SDK.

Sources/SWBTaskExecution/TaskActions/EmbedSwiftStdLibTaskAction.swift

@@ -27,7 +27,7 @@ fileprivate extension MachO {
             .flatMap { try $0.linkedLibraryPaths() }
             .compactMap { (lib: String) -> String? in
                 let pcs = Path(lib)
-                if (pcs.dirname.str == "@rpath" || pcs.dirname == Path("/usr/lib/swift_static")) && executableFileNameMatchesSwiftRuntimeLibPattern(pcs.basename) {
+                if (pcs.dirname.str == "@rpath" || pcs.dirname == Path("/usr/lib/swift")) && executableFileNameMatchesSwiftRuntimeLibPattern(pcs.basename) {
                     return pcs.basename
                 }
                 else {

Sources/SWBUniversalPlatform/Specs/Clang.xcspec

@@ -323,22 +323,6 @@
                 );
                 Category = LanguageObjC;
             },
-            {
-                Name = "CLANG_FORCE_STATIC_LINK_STDLIB";
-                Type = Boolean;
-                DefaultValue = "$(SWIFT_FORCE_STATIC_LINK_STDLIB)";
-                CommandLineArgs = {
-                    YES = ();
-                    NO = ();
-                };
-                // This option is passed for linking to inform the compiler
-                // that the ObjC runtime must be linked in (with possible
-                // backwards compatibility libraries linked in).
-                AdditionalLinkerArgs = {
-                    YES = ( "$(LD_FORCE_STATIC_LINK_STDLIB)" );
-                    NO = ();
-                };
-            },
             {
                 Name = "CLANG_USE_RESPONSE_FILE";
                 Type = Boolean;

Sources/SWBUniversalPlatform/Specs/Ld.xcspec

@@ -157,18 +157,6 @@
                 Name = LD_OBJC_RUNTIME_ARGS_swiftc;
                 DefaultValue = "-link-objc-runtime";
             },
-            {
-                Name = LD_FORCE_STATIC_LINK_STDLIB;
-                DefaultValue = "$(LD_STATIC_LINK_ARGS$(LINKER_DRIVER))";
-            },
-            {
-                Name = LD_FORCE_STATIC_LINK_STDLIB_clang;
-                DefaultValue = "-static";
-            },
-            {
-                Name = LD_FORCE_STATIC_LINK_STDLIB_swiftc;
-                DefaultValue = "-force_load_swift_libs";
-            },
             {
                 Name = CLANG_SDKROOT_LINKER_INPUT;
                 Type = Path;

Sources/SWBUniversalPlatform/Specs/Swift.xcspec

@@ -1119,22 +1119,7 @@
                     NO = ();
                 };
             },
-            {
-                Name = "SWIFT_FORCE_STATIC_LINK_STDLIB";
-                Type = Boolean;
-                DefaultValue = "$(SWIFT_FORCE_STATIC_LINK_STDLIB)";
-                CommandLineArgs = {
-                    YES = ();
-                    NO = ();
-                };
-                // This option is passed for linking to inform the compiler
-                // that the ObjC runtime must be linked in (with possible
-                // backwards compatibility libraries linked in).
-                AdditionalLinkerArgs = {
-                    YES = ( "$(LD_FORCE_STATIC_LINK_STDLIB)" );
-                    NO = ();
-                };
-            },
+
             {
                 Name = "CLANG_COVERAGE_MAPPING";
                 Type = Boolean;