fixup! HEAD

Author: compnerd

Sources/Runtimes/cmake/modules/EmitSwiftInterface.cmake

@@ -47,8 +47,5 @@ function(emit_swift_interface target)
         "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-interface-path ${CMAKE_CURRENT_BINARY_DIR}/${module_name}.swiftmodule/${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.swiftinterface>"
         "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-private-module-interface-path ${CMAKE_CURRENT_BINARY_DIR}/${module_name}.swiftmodule/${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.private.swiftinterface>")
     endif()
-    target_compile_options(${target} PRIVATE
-      $<$<COMPILE_LANGUAGE:Swift>:-library-level$<SEMICOLON>api>
-      $<$<COMPILE_LANGUAGE:Swift>:-Xfrontend$<SEMICOLON>-require-explicit-availability=ignore>)
   endif()
 endfunction()

Utilities/bootstrap

@@ -726,6 +726,10 @@ def build_swiftpm_with_cmake(args):
     """Builds SwiftPM using CMake."""
     logging.info("Building SwiftPM (with CMake)")
 
+    module_triple = get_build_target(args)
+    if platform.system() == 'Darwin':
+        module_triple = module_triple.replace('macosx', 'macos')
+
     cmake_flags = [
         get_llbuild_cmake_arg(args),
         "-DTSC_DIR="               + os.path.join(args.build_dirs["tsc"],                   "cmake/modules"),
@@ -738,6 +742,8 @@ def build_swiftpm_with_cmake(args):
         "-DSwiftCertificates_DIR=" + os.path.join(args.build_dirs["swift-certificates"],    "cmake/modules"),
         "-DSwiftBuild_DIR="        + os.path.join(args.build_dirs["swift-build"],           "cmake/modules"),
         "-DSWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE=" + args.source_dirs["swift-syntax"],
+        "-DCMAKE_Swift_COMPILER_TARGET={}".format((get_build_target(args) + g_macos_deployment_target) if platform.system() == 'Darwin' else get_build_target(args)),
+        "-DSwiftPMRuntime_MODULE_TRIPLE={}".format(module_triple),
     ]
 
     if platform.system() == 'Darwin':
@@ -746,14 +752,14 @@ def build_swiftpm_with_cmake(args):
 
     build_with_cmake(args, cmake_flags, ["swift-bootstrap", "PackageDescription", "PackagePlugin", "CompilerPluginSupport"], args.project_root, args.bootstrap_dir)
 
-    triple = get_build_target(args)
-
     mkdir_p(os.path.join(args.bootstrap_dir, "pm", "ManifestAPI"))
-    shutil.copy2(os.path.join(args.bootstrap_dir, "Sources", "Runtimes", "PackageDescription", "PackageDescription.swiftmodule", "%s.swiftmodule" % triple),
+    shutil.copy2(os.path.join(args.bootstrap_dir, "Sources", "Runtimes", "PackageDescription", "PackageDescription.swiftmodule", "%s.swiftmodule" % module_triple),
                  os.path.join(args.bootstrap_dir, "pm", "ManifestAPI", "PackageDescription.swiftmodule"))
+    shutil.copy2(os.path.join(args.bootstrap_dir, "Sources", "Runtimes", "CompilerPluginSupport", "CompilerPluginSupport.swiftmodule", "%s.swiftmodule" % module_triple),
+                 os.path.join(args.bootstrap_dir, "pm", "ManifestAPI", "CompilerPluginSupport.swiftmodule"))
 
     mkdir_p(os.path.join(args.bootstrap_dir, "pm", "PluginAPI"))
-    shutil.copy2(os.path.join(args.bootstrap_dir, "Sources", "Runtimes", "PackagePlugin", "PackagePlugin.swiftmodule", "%s.swiftmodule" % triple),
+    shutil.copy2(os.path.join(args.bootstrap_dir, "Sources", "Runtimes", "PackagePlugin", "PackagePlugin.swiftmodule", "%s.swiftmodule" % module_triple),
                  os.path.join(args.bootstrap_dir, "pm", "PluginAPI", "PackagePlugin.swiftmodule"))
 
     if args.llbuild_link_framework: