From 9c9010e5b7506c4bd89c5ef0148e4741b32a1a2c Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Sat, 19 Aug 2023 00:18:53 +0000
Subject: [PATCH 01/12] [CMake] Support Macros in Linux

For compiling codes required for macro support, we now need swiftc
compiler in the build machine.

Unlike Darwin OSes, where swiftCore runtime is guaranteed to be present
in /usr/lib, Linux doesn't have ABI stability and the stdlib of the
build machine is not at the specific location. So the built compiler
cannot relies on the shared object in the toolchain.
---
 CMakeLists.txt                                |  1 +
 SwiftCompilerSources/CMakeLists.txt           |  8 ++-
 cmake/modules/AddPureSwift.cmake              | 22 ++++++
 cmake/modules/AddSwift.cmake                  | 22 ++++--
 cmake/modules/AddSwiftUnittests.cmake         | 27 ++++++-
 cmake/modules/SwiftImplicitImport.cmake       |  2 +-
 cmake/modules/SwiftStripBuilderRpath.cmake    | 71 +++++++++++++++++++
 lib/CMakeLists.txt                            | 43 +++++++++--
 lib/Macros/CMakeLists.txt                     | 25 ++++++-
 lib/SwiftDemangle/CMakeLists.txt              |  7 ++
 test/lit.cfg                                  | 38 +++++-----
 .../cmake/modules/AddSwiftSourceKit.cmake     | 26 +++----
 .../tools/complete-test/CMakeLists.txt        |  6 ++
 .../tools/sourcekitd-repl/CMakeLists.txt      |  6 ++
 .../tools/sourcekitd-test/CMakeLists.txt      |  6 ++
 tools/libStaticMirror/CMakeLists.txt          |  6 ++
 tools/libSwiftScan/CMakeLists.txt             | 29 ++++++--
 tools/swift-plugin-server/CMakeLists.txt      |  5 ++
 unittests/SwiftDemangle/CMakeLists.txt        |  2 +-
 unittests/Threading/CMakeLists.txt            |  2 +-
 unittests/runtime/CMakeLists.txt              |  2 +-
 unittests/runtime/LongTests/CMakeLists.txt    |  2 +-
 utils/build-presets.ini                       |  3 +-
 .../products/earlyswiftsyntax.py              | 20 ++----
 24 files changed, 304 insertions(+), 77 deletions(-)
 create mode 100644 cmake/modules/SwiftStripBuilderRpath.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 753ff53570787..b8e072d218c02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -794,6 +794,7 @@ include(SwiftConfigureSDK)
 include(SwiftComponents)
 include(SwiftList)
 include(AddPureSwift)
+include(SwiftStripBuilderRpath)
 
 # Configure swift include, install, build components.
 swift_configure_components()
diff --git a/SwiftCompilerSources/CMakeLists.txt b/SwiftCompilerSources/CMakeLists.txt
index 4fbd4fca9e514..138d208d9a3a9 100644
--- a/SwiftCompilerSources/CMakeLists.txt
+++ b/SwiftCompilerSources/CMakeLists.txt
@@ -235,7 +235,7 @@ else()
   #
   # step 1: generate a dummy source file, which just includes all headers
   # defined in include/swift/module.modulemap
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp"
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp.tmp"
        "
 #include \"Basic/BridgedSwiftObject.h\"
 #include \"Basic/BasicBridging.h\"
@@ -251,6 +251,12 @@ else()
 
 #include \"Parse/RegexParserBridging.h\"
 ")
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp"
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp.tmp"
+      "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp"
+  )
 
   # step 2: build a library containing that source file. This library depends on all the included header files.
   #         The swift modules can now depend on that target.
diff --git a/cmake/modules/AddPureSwift.cmake b/cmake/modules/AddPureSwift.cmake
index 8d26200a551d3..401fdeb4e46bd 100644
--- a/cmake/modules/AddPureSwift.cmake
+++ b/cmake/modules/AddPureSwift.cmake
@@ -65,6 +65,27 @@ function(_add_host_swift_compile_options name)
   _add_host_variant_swift_sanitizer_flags(${name})
 endfunction()
 
+function(_set_pure_swift_link_flags name relpath_to_lib_dir)
+  if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
+    # Don't add builder's stdlib RPATH automatically, because we want to *de-prioritize* it.
+    target_compile_options(${name} PRIVATE
+      $<$<COMPILE_LANGUAGE:Swift>:-no-toolchain-stdlib-rpath>
+    )
+
+    get_filename_component(swift_bin_dir ${CMAKE_Swift_COMPILER} DIRECTORY)
+    get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
+    set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+
+    set_property(TARGET ${name}
+      APPEND PROPERTY INSTALL_RPATH
+        # At runtime, use swiftCore in the current toolchain.
+        "$ORIGIN/${relpath_to_lib_dir}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
+        # But before building the stdlib with the tool, use the builder libs. This should be removed in install time.
+        "${host_lib_dir}")
+
+  endif()
+endfunction()
+
 # Add a new "pure" Swift host library.
 #
 # "Pure" Swift host libraries can only contain Swift code, and will be built
@@ -266,6 +287,7 @@ function(add_pure_swift_host_tool name)
   # Create the library.
   add_executable(${name} ${APSHT_SOURCES})
   _add_host_swift_compile_options(${name})
+  _set_pure_swift_link_flags(${name} "../lib")
 
   if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
     set_property(TARGET ${name}
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
index d4f19d1e2d376..1f0030339034a 100644
--- a/cmake/modules/AddSwift.cmake
+++ b/cmake/modules/AddSwift.cmake
@@ -548,10 +548,14 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
       target_link_libraries(${target} PRIVATE "swiftCore")
 
       target_link_directories(${target} PRIVATE ${host_lib_dir})
+
+      # At runtime, use swiftCore in the current toolchain.
+      # FIXME: This assumes the ABI hasn't changed since the builder.
+      set(swift_runtime_rpath "$ORIGIN/${relpath_to_lib_dir}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+
       if(ASRLF_BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
-        set(swift_runtime_rpath "${host_lib_dir}")
-      else()
-        set(swift_runtime_rpath "$ORIGIN/${relpath_to_lib_dir}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+        # But before building the stdlib with the tool, use the builder libs. This should be removed in install time.
+        list(APPEND swift_runtime_rpath "${host_lib_dir}")
       endif()
 
     elseif(ASRLF_BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
@@ -576,9 +580,6 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
   endif()
 
   if(SWIFT_SWIFT_PARSER)
-    # Make sure we can find the early SwiftSyntax libraries.
-    target_link_directories(${target} PRIVATE "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host")
-
     # For the "end step" of bootstrapping configurations, we need to be
     # able to fall back to the SDK directory for libswiftCore et al.
     if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
@@ -967,7 +968,14 @@ function(add_swift_host_tool executable)
     swift_install_in_component(TARGETS ${executable}
                                RUNTIME
                                  DESTINATION bin
-                                 COMPONENT ${ASHT_SWIFT_COMPONENT})
+                                 COMPONENT ${ASHT_SWIFT_COMPONENT}
+    )
+
+    swift_install_strip_builder_rpath(
+      TARGETS ${executable}
+      DESTINATION bin
+      COMPONENT ${ASHT_SWIFT_COMPONENT}
+    )
 
     swift_is_installing_component(${ASHT_SWIFT_COMPONENT} is_installing)
   endif()
diff --git a/cmake/modules/AddSwiftUnittests.cmake b/cmake/modules/AddSwiftUnittests.cmake
index a4573981c225c..45acb9bf10698 100644
--- a/cmake/modules/AddSwiftUnittests.cmake
+++ b/cmake/modules/AddSwiftUnittests.cmake
@@ -5,10 +5,32 @@ add_custom_target(SwiftUnitTests)
 
 set_target_properties(SwiftUnitTests PROPERTIES FOLDER "Tests")
 
+# Add a new Swift unit test executable.
+#
+# Usage:
+#   add_swift_unittest(name
+#     [IS_TARGET_TEST]
+#     source1 [source2 source3 ...])
+#
+# name
+#   Name of the test (e.g., SwiftASTTest).
+#
+# IS_TARGET_TEST
+#   Indicates this is a test for target libraries. Not host library.
+#   This avoids linking with toolchains stdlib.
+#
+# source1 ...
+#   Sources to add into this executable.
 function(add_swift_unittest test_dirname)
+  cmake_parse_arguments(ASU
+                        "IS_TARGET_TEST"
+                        ""
+                        ""
+                        ${ARGN})
+
   # *NOTE* Even though "add_unittest" does not have llvm in its name, it is a
   # function defined by AddLLVM.cmake.
-  add_unittest(SwiftUnitTests ${test_dirname} ${ARGN})
+  add_unittest(SwiftUnitTests ${test_dirname} ${ASU_UNPARSED_ARGUMENTS})
 
   set_target_properties(${test_dirname} PROPERTIES LINKER_LANGUAGE CXX)
 
@@ -89,7 +111,8 @@ function(add_swift_unittest test_dirname)
     endif()
   endif()
 
-  if (SWIFT_SWIFT_PARSER)
+  if (SWIFT_SWIFT_PARSER AND NOT ASU_IS_TARGET_TEST)
+    # Link to stdlib the compiler uses.
     _add_swift_runtime_link_flags(${test_dirname} "../../lib" "")
     set_property(TARGET ${test_dirname} PROPERTY BUILD_WITH_INSTALL_RPATH OFF)
   endif()
diff --git a/cmake/modules/SwiftImplicitImport.cmake b/cmake/modules/SwiftImplicitImport.cmake
index 50c5e5415ff81..3c79357f01883 100644
--- a/cmake/modules/SwiftImplicitImport.cmake
+++ b/cmake/modules/SwiftImplicitImport.cmake
@@ -6,7 +6,7 @@ function(swift_supports_implicit_module module_name out_var)
       "${CMAKE_Swift_COMPILER}"
       -Xfrontend -disable-implicit-${module_name}-module-import
       -Xfrontend -parse-stdlib
-      -c - -o /dev/null
+      -parse -
     INPUT_FILE
       "${CMAKE_BINARY_DIR}/tmp/empty-check-${module_name}.swift"
     OUTPUT_QUIET ERROR_QUIET
diff --git a/cmake/modules/SwiftStripBuilderRpath.cmake b/cmake/modules/SwiftStripBuilderRpath.cmake
new file mode 100644
index 0000000000000..8df406b0388df
--- /dev/null
+++ b/cmake/modules/SwiftStripBuilderRpath.cmake
@@ -0,0 +1,71 @@
+set(SWIFT_SET_RPATH_SCRIPT_FILE "${CMAKE_CURRENT_LIST_FILE}")
+
+function(swift_get_set_rpath_script_file out_var)
+  set(${out_var} "${SWIFT_SET_RPATH_SCRIPT_FILE}" PARENT_SCOPE)
+endfunction()
+
+# Actual RPATH_SET operation to the file.
+function(_swift_set_rpath_impl file new_rpath)
+  # NOTE: RPATH_SET is not documented, and works only for ELF and XCOFF. 
+  file(RPATH_SET FILE "${file}" NEW_RPATH "${new_rpath}")
+endfunction()
+
+# For 'install(SCRIPT <script> CODE swift_set_rpath(...)'.
+function(_swift_file_set_rpath_installed file new_rpath)
+  set(DESTDIR $ENV{DESTDIR})
+  if(NOT IS_ABSOLUTE "${file}")
+    string(PREPEND file "${CMAKE_INSTALL_PREFIX}/")
+  endif()
+  string(PREPEND file "${DESTDIR}")
+  _swift_set_rpath_impl("${file}" "${new_rpath}")
+endfunction()
+
+# Add 'install' script that set runtime path to the specified file.
+function(swift_install_file_set_rpath file install_rpath component)
+  if(NOT(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX"))
+      return()
+  endif()
+  if((NOT SWIFT_SWIFT_PARSER) AND NOT(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS"))
+      return()
+  endif()
+
+  swift_get_set_rpath_script_file(script)
+
+  swift_install_in_component(
+    SCRIPT "${script}" 
+    CODE "_swift_file_set_rpath_installed(\"${file}\" \"${install_rpath}\")"
+    COMPONENT ${component}
+  )
+endfunction()
+
+# Add 'install' script that set runtime path to the target but only startinig with '$ORIGIN'
+function(swift_install_strip_builder_rpath)
+  cmake_parse_arguments(RPATH
+                        ""
+                        "DESTINATION;COMPONENT"
+                        "TARGETS"
+                        ${ARGN})
+
+  foreach(target ${RPATH_TARGETS})
+    # Filter out RPATHs *not* starting with $ORIGIN
+    set(stripped_rpaths)
+    get_target_property(install_rpaths ${target} INSTALL_RPATH)
+    foreach(path ${install_rpaths})
+        if (path MATCHES "^\\$ORIGIN")
+        list(APPEND stripped_rpaths "${path}")
+        endif()
+    endforeach()
+
+    list(JOIN stripped_rpaths ":" install_rpath_str)
+    swift_install_file_set_rpath(
+      "${RPATH_DESTINATION}/$<TARGET_FILE_NAME:${target}>"
+      "${install_rpath_str}"
+      ${RPATH_COMPONENT}
+    )
+  endforeach()
+endfunction()
+
+# For 'cmake -P <scirpt>'.
+if (SWIFT_SET_RPATH_FILE AND SWIFT_SET_RPATH_NEW_RPATH)
+  _swift_set_rpath_impl("${SWIFT_SET_RPATH_FILE}" "${SWIFT_SET_RPATH_NEW_RPATH}")
+endif()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0f5e768073993..dabaeca5127f3 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -33,7 +33,7 @@ if (SWIFT_SWIFT_PARSER)
   list(TRANSFORM SWIFT_SYNTAX_MODULES PREPEND "SwiftSyntax::"
        OUTPUT_VARIABLE SWIFT_SYNTAX_TARGETS)
 
-  set(SWIFT_SYNTAX_LIBRARIES_SOURCE_DIR
+  set(SWIFT_SYNTAX_LIBRARIES_BUILD_DIR
       "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host")
   set(SWIFT_HOST_LIBRARIES_DEST_DIR
       "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/swift/host")
@@ -53,10 +53,27 @@ if (SWIFT_SWIFT_PARSER)
   # Copy over all of the shared libraries from earlyswiftsyntax so they can
   # be found via RPATH.
   foreach (sharedlib ${SWIFT_SYNTAX_SHARED_LIBRARIES})
+    set(add_origin_rpath)
+    if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
+      get_filename_component(swift_bin_dir ${CMAKE_Swift_COMPILER} DIRECTORY)
+      get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
+      set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+
+      # At runtime, use swiftCore in the current toolchain.
+      
+      swift_get_set_rpath_script_file(setrpath_command)
+      set(add_origin_rpath COMMAND ${CMAKE_COMMAND}
+        "-DSWIFT_SET_RPATH_FILE=${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}"
+        "-DSWIFT_SET_RPATH_NEW_RPATH='$$ORIGIN:$$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}:${host_lib_dir}'"
+        -P "${setrpath_command}"
+      )
+    endif()
+
     add_custom_command(
       OUTPUT "${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}"
-      DEPENDS "${SWIFT_SYNTAX_LIBRARIES_SOURCE_DIR}/${sharedlib}"
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SWIFT_SYNTAX_LIBRARIES_SOURCE_DIR}/${sharedlib} ${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}
+      DEPENDS "${SWIFT_SYNTAX_LIBRARIES_BUILD_DIR}/${sharedlib}"
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SWIFT_SYNTAX_LIBRARIES_BUILD_DIR}/${sharedlib} ${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}
+      ${add_origin_rpath}
     )
 
     add_custom_target(copy_swiftSyntaxLibrary_${sharedlib}
@@ -64,6 +81,18 @@ if (SWIFT_SWIFT_PARSER)
       COMMENT "Copying ${sharedlib}"
     )
 
+    swift_install_in_component(
+      FILES "${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}"
+      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
+      COMPONENT compiler
+    )
+
+    swift_install_file_set_rpath(
+      "lib${LLVM_LIBDIR_SUFFIX}/swift/host/${sharedlib}"
+      "$ORIGIN:$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
+      compiler
+    )
+
     add_dependencies(swiftSyntaxLibraries copy_swiftSyntaxLibrary_${sharedlib})
   endforeach()
 
@@ -76,7 +105,7 @@ if (SWIFT_SWIFT_PARSER)
   foreach(module_dir ${SWIFT_SYNTAX_MODULE_DIRS})
     # Find all of the source module files.
     file(GLOB module_files
-         "${SWIFT_SYNTAX_LIBRARIES_SOURCE_DIR}/${module_dir}/*.swiftinterface")
+      "${SWIFT_SYNTAX_LIBRARIES_BUILD_DIR}/${module_dir}/*.swiftinterface")
 
     # Determine the destination module files.
     set(dest_module_files)
@@ -98,6 +127,12 @@ if (SWIFT_SWIFT_PARSER)
       COMMENT "Copying ${module_dir}"
     )
 
+    swift_install_in_component(
+      FILES ${dest_module_files}
+      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/${module_dir}"
+      COMPONENT compiler
+    )
+
     add_dependencies(swiftSyntaxLibraries copy_swiftSyntaxModule_${module_dir})
   endforeach()
 
diff --git a/lib/Macros/CMakeLists.txt b/lib/Macros/CMakeLists.txt
index ed98b3d9f5789..4f15512d0e315 100644
--- a/lib/Macros/CMakeLists.txt
+++ b/lib/Macros/CMakeLists.txt
@@ -31,6 +31,19 @@ function(add_swift_macro_library name)
   # Add the library.
   add_pure_swift_host_library(${name} SHARED ${ASML_SOURCES})
 
+  # Add rpath to 'lib/{platform}'
+  file(RELATIVE_PATH relpath_to_lib
+    "${SWIFT_HOST_PLUGINS_DEST_DIR}"
+    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+  )
+  _set_pure_swift_link_flags(${name} "${relpath_to_lib}")
+
+  # Add rpath to 'lib/host'
+  if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
+    set_property(TARGET ${name}
+      APPEND PROPERTY INSTALL_RPATH "$ORIGIN/..")
+  endif()
+
   # If we don't have the Swift swift parser, bail out, because the above
   # add_pure_swift_host_library did nothing.
   if (NOT SWIFT_SWIFT_PARSER)
@@ -44,14 +57,22 @@ function(add_swift_macro_library name)
       LIBRARY_OUTPUT_DIRECTORY "${SWIFT_HOST_PLUGINS_DEST_DIR}"
   )
 
+  set(destination_dir "lib${LLVM_LIBDIR_SUFFIX}/swift/host/plugins")
+
   swift_install_in_component(TARGETS ${name}
     LIBRARY
-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/plugins"
+      DESTINATION "${destination_dir}"
       COMPONENT compiler
     ARCHIVE
-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/plugins"
+      DESTINATION "${destination_dir}"
       COMPONENT compiler)
 
+  swift_install_strip_builder_rpath(
+    TARGETS ${name}
+    DESTINATION "${destination_dir}"
+    COMPONENT compiler
+  )
+
   # Export this macro plugin target.
   set_property(GLOBAL APPEND PROPERTY SWIFT_MACRO_PLUGINS ${name})
 endfunction()
diff --git a/lib/SwiftDemangle/CMakeLists.txt b/lib/SwiftDemangle/CMakeLists.txt
index 864bea94cc167..9b14ba3f75de8 100644
--- a/lib/SwiftDemangle/CMakeLists.txt
+++ b/lib/SwiftDemangle/CMakeLists.txt
@@ -17,3 +17,10 @@ swift_install_in_component(TARGETS swiftDemangle
   ARCHIVE
     DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
     COMPONENT compiler)
+
+
+swift_install_strip_builder_rpath(
+  TARGETS swiftDemangle
+  DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
+  COMPONENT compiler
+)
diff --git a/test/lit.cfg b/test/lit.cfg
index 045db7a578bc4..aad2262623533 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -533,35 +533,31 @@ lit_config.note("Using code completion cache: " + completion_cache_path)
 
 config.swift_host_lib_dir = make_path(config.swift_lib_dir, 'swift', 'host')
 
-if kIsWindows:
-    config.swift_driver = (
-        "%r %s %s %s -libc %s" % (config.swift, mcp_opt,
-                                  config.swift_test_options,
-                                  config.swift_driver_test_options,
-                                  config.swift_stdlib_msvc_runtime))
-    config.swiftc_driver = (
-        "%r -toolchain-stdlib-rpath %s %s %s" % (config.swiftc, mcp_opt,
-                                                 config.swift_test_options,
-                                                 config.swift_driver_test_options))
-else:
+if platform.system() == 'Darwin':
     config.swift_driver = (
         "env SDKROOT=%s %r %s %s %s"
         % (shell_quote(config.host_sdkroot), config.swift, mcp_opt, config.swift_test_options, config.swift_driver_test_options))
     config.swiftc_driver = (
         "env SDKROOT=%s %r -toolchain-stdlib-rpath -Xlinker -rpath -Xlinker /usr/lib/swift %s %s %s"
         % (shell_quote(config.host_sdkroot), config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options))
-
-if platform.system() == 'Darwin':
-    host_build_extra_rpath=""
-elif config.host_triple:
+    config.host_build_swift = (
+        "%s -sdk %s -target %s -I %s -L %s"
+        % (config.swiftc_driver, config.host_sdkroot, config.host_triple, config.swift_host_lib_dir, config.swift_host_lib_dir))
+else:
+    config.swift_driver = (
+        "%r %s %s %s"
+        % (config.swift, mcp_opt, config.swift_test_options, config.swift_driver_test_options))
+    if kIsWindows:
+        config.swift_driver += " -libc " + config.swift_stdlib_msvc_runtime
+    config.swiftc_driver = (
+        "%r -toolchain-stdlib-rpath %s %s %s"
+        % (config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options))
     # Parse the host triple.
     (host_cpu, host_vendor, host_os, host_vers) = re.match('([^-]+)-([^-]+)-([^0-9-]+)(.*)', config.host_triple).groups()
-    host_build_extra_rpath="-Xlinker -rpath -Xlinker %s" % (make_path(config.swift_lib_dir, 'swift', host_os))
-else:
-    host_build_extra_rpath=""
-
-config.host_build_swift = (
-    "%s -sdk %s -target %s -I %s -L %s %s" % (config.swiftc_driver, config.host_sdkroot, config.host_triple, config.swift_host_lib_dir, config.swift_host_lib_dir, host_build_extra_rpath))
+    toolchain_lib_dir = make_path(config.swift_lib_dir, 'swift', host_os)
+    config.host_build_swift = (
+        "%s -target %s -I %s -L %s -Xlinker -rpath -Xlinker %s"
+        % (config.swiftc_driver, config.host_triple, config.swift_host_lib_dir, config.swift_host_lib_dir, toolchain_lib_dir))
 
 config.substitutions.append( ('%llvm_obj_root', config.llvm_obj_root) )
 config.substitutions.append( ('%swift-bin-dir', config.swift_bin_dir) )
diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
index cc55ac113c9bc..909fc56ec72c7 100644
--- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
+++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
@@ -129,11 +129,12 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
       target_link_libraries(${target} PRIVATE "swiftCore")
 
       target_link_directories(${target} PRIVATE ${host_lib_dir})
+
+      file(RELATIVE_PATH relative_rtlib_path "${path}" "${SWIFTLIB_DIR}/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+      list(APPEND RPATH_LIST "$ORIGIN/${relative_rtlib_path}")
+
       if(ASKD_BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
         list(APPEND RPATH_LIST "${host_lib_dir}")
-      else()
-        file(RELATIVE_PATH relative_rtlib_path "${path}" "${SWIFTLIB_DIR}/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
-        list(APPEND RPATH_LIST "$ORIGIN/${relative_rtlib_path}")
       endif()
 
     elseif(ASKD_BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
@@ -301,6 +302,15 @@ macro(add_sourcekit_library name)
     RUNTIME
       DESTINATION "bin"
       COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}")
+
+  if(SOURCEKITLIB_SHARED)
+    swift_install_strip_builder_rpath(
+      TARGETS ${name}
+      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
+      COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}"
+    )
+  endif()
+
   swift_install_in_component(FILES ${SOURCEKITLIB_HEADERS}
                              DESTINATION "include/SourceKit"
                              COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}")
@@ -351,16 +361,6 @@ macro(add_sourcekit_executable name)
   add_sourcekit_default_compiler_flags("${name}")
 
   set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)
-
-  if(SWIFT_SWIFT_PARSER)
-    set(SKEXEC_HAS_SWIFT_MODULES TRUE)
-  else()
-    set(SKEXEC_HAS_SWIFT_MODULES FALSE)
-  endif()
-
-  set(RPATH_LIST)
-  add_sourcekit_swift_runtime_link_flags(${name} ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR} ${SKEXEC_HAS_SWIFT_MODULES})
-
 endmacro()
 
 # Add a new SourceKit framework.
diff --git a/tools/SourceKit/tools/complete-test/CMakeLists.txt b/tools/SourceKit/tools/complete-test/CMakeLists.txt
index d1b3fe3b36a8f..b1970fc26c197 100644
--- a/tools/SourceKit/tools/complete-test/CMakeLists.txt
+++ b/tools/SourceKit/tools/complete-test/CMakeLists.txt
@@ -27,3 +27,9 @@ endif()
 add_dependencies(tools complete-test)
 swift_install_in_component(TARGETS complete-test
   RUNTIME DESTINATION bin COMPONENT tools)
+
+swift_install_strip_builder_rpath(
+  TARGETS complete-test
+  DESTINATION bin
+  COMPONENT tools
+)
diff --git a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
index f8cea3683f071..1f459f1617787 100644
--- a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
+++ b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
@@ -29,3 +29,9 @@ endif()
 add_dependencies(tools sourcekitd-repl)
 swift_install_in_component(TARGETS sourcekitd-repl
   RUNTIME DESTINATION bin COMPONENT tools)
+
+swift_install_strip_builder_rpath(
+  TARGETS sourcekitd-repl
+  DESTINATION bin
+  COMPONENT tools
+)
diff --git a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
index e5f7aa5c9fba5..d20060a014303 100644
--- a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
+++ b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
@@ -39,3 +39,9 @@ endif()
 add_dependencies(tools sourcekitd-test)
 swift_install_in_component(TARGETS sourcekitd-test
   RUNTIME DESTINATION bin COMPONENT tools)
+
+swift_install_strip_builder_rpath(
+  TARGETS sourcekitd-test
+  DESTINATION bin
+  COMPONENT tools
+)
diff --git a/tools/libStaticMirror/CMakeLists.txt b/tools/libStaticMirror/CMakeLists.txt
index 1b8c563b05aae..e429fa2ef8090 100644
--- a/tools/libStaticMirror/CMakeLists.txt
+++ b/tools/libStaticMirror/CMakeLists.txt
@@ -37,3 +37,9 @@ swift_install_in_component(TARGETS libStaticMirror
 swift_install_in_component(DIRECTORY "${SWIFT_MAIN_INCLUDE_DIR}/swift-c/StaticMirror/"
                            DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SCAN_LIB_NAME}"
                            COMPONENT static-mirror-lib)
+
+swift_install_strip_builder_rpath(
+  TARGETS libStaticMirror
+  DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
+  COMPONENT static-mirror-lib
+)
diff --git a/tools/libSwiftScan/CMakeLists.txt b/tools/libSwiftScan/CMakeLists.txt
index f675451160068..79bb9f0086016 100644
--- a/tools/libSwiftScan/CMakeLists.txt
+++ b/tools/libSwiftScan/CMakeLists.txt
@@ -31,13 +31,22 @@ set_target_properties(libSwiftScan
     OUTPUT_NAME ${SWIFT_SCAN_LIB_NAME})
 
 if(SWIFT_SWIFT_PARSER)
-  # Ensure that we can find the host shared libraries.
-  set_property(
-    TARGET libSwiftScan
-    APPEND PROPERTY INSTALL_RPATH "@loader_path/swift/host")
-  set_property(
-    TARGET libSwiftScan
-    APPEND PROPERTY INSTALL_RPATH "@loader_path/../host")
+  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
+    # Ensure that we can find the host shared libraries.
+    set_property(
+      TARGET libSwiftScan
+      APPEND PROPERTY INSTALL_RPATH "@loader_path/swift/host")
+    set_property(
+      TARGET libSwiftScan
+      APPEND PROPERTY INSTALL_RPATH "@loader_path/../host")
+  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
+    set_property(
+      TARGET libSwiftScan
+      APPEND PROPERTY INSTALL_RPATH "$ORIGIN/swift/host")
+    set_property(
+      TARGET libSwiftScan
+      APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../host")
+  endif()
 endif()
 
 add_llvm_symbol_exports(libSwiftScan ${LLVM_EXPORTED_SYMBOL_FILE})
@@ -60,6 +69,12 @@ else()
     LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
     RUNTIME DESTINATION "bin" COMPONENT compiler)
 
+  swift_install_strip_builder_rpath(
+    TARGETS libSwiftScan
+    DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
+    COMPONENT compiler
+  )
+
   # Create a symlink to previously-used path of 'lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}'
   # to the new location under 'lib/swift/host' for clients of the legacy path.
   if(EXISTS ${LLVM_CMAKE_DIR}/LLVMInstallSymlink.cmake)
diff --git a/tools/swift-plugin-server/CMakeLists.txt b/tools/swift-plugin-server/CMakeLists.txt
index 09332309b10c9..9997b964d9347 100644
--- a/tools/swift-plugin-server/CMakeLists.txt
+++ b/tools/swift-plugin-server/CMakeLists.txt
@@ -30,4 +30,9 @@ if (SWIFT_SWIFT_PARSER)
       DESTINATION bin
       COMPONENT compiler
   )
+  swift_install_strip_builder_rpath(
+    TARGETS swift-plugin-server
+    DESTINATION bin
+    COMPONENT compiler
+  )
 endif()
diff --git a/unittests/SwiftDemangle/CMakeLists.txt b/unittests/SwiftDemangle/CMakeLists.txt
index 9ba1aeb348d2d..d5657e511b811 100644
--- a/unittests/SwiftDemangle/CMakeLists.txt
+++ b/unittests/SwiftDemangle/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(TARGET swiftDemangle)
-  add_swift_unittest(SwiftDemangleTests
+  add_swift_unittest(SwiftDemangleTests IS_TARGET_TEST
     DemangleTest.cpp
   )
   set_target_properties(SwiftDemangleTests
diff --git a/unittests/Threading/CMakeLists.txt b/unittests/Threading/CMakeLists.txt
index 239630d038c6d..aa29d7152b95f 100644
--- a/unittests/Threading/CMakeLists.txt
+++ b/unittests/Threading/CMakeLists.txt
@@ -1,6 +1,6 @@
 if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
    ("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "${SWIFT_PRIMARY_VARIANT_ARCH}"))
-  add_swift_unittest(SwiftThreadingTests
+  add_swift_unittest(SwiftThreadingTests IS_TARGET_TEST
     Mutex.cpp
     ConditionVariable.cpp
     Once.cpp
diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt
index 4f316f18f5f6a..d12c6bfe28927 100644
--- a/unittests/runtime/CMakeLists.txt
+++ b/unittests/runtime/CMakeLists.txt
@@ -98,7 +98,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
     Actor.cpp
     TaskStatus.cpp)
 
-  add_swift_unittest(SwiftRuntimeTests
+  add_swift_unittest(SwiftRuntimeTests IS_TARGET_TEST
     Array.cpp
     CompatibilityOverrideRuntime.cpp
     CompatibilityOverrideConcurrency.cpp
diff --git a/unittests/runtime/LongTests/CMakeLists.txt b/unittests/runtime/LongTests/CMakeLists.txt
index 37b5e00714e03..e16bc0d540b4e 100644
--- a/unittests/runtime/LongTests/CMakeLists.txt
+++ b/unittests/runtime/LongTests/CMakeLists.txt
@@ -34,7 +34,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
     list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization)
   endif()
 
-  add_swift_unittest(SwiftRuntimeLongTests
+  add_swift_unittest(SwiftRuntimeLongTests IS_TARGET_TEST
     LongRefcounting.cpp
     ../Stdlib.cpp
     ${PLATFORM_SOURCES}
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index f291bff90127f..11ad09d2fa685 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -859,7 +859,6 @@ install-lldb
 install-llbuild
 install-swiftpm
 install-swift-driver
-install-swiftsyntax
 install-xctest
 install-libicu
 install-prefix=/usr
@@ -890,6 +889,8 @@ installable-package=%(installable_package)s
 # in Linux CI bots
 relocate-xdg-cache-home-under-build-subdir
 
+# Linux only support 'hosttools' with early-swiftsyntax.
+bootstrapping=hosttools
 
 [preset: buildbot_linux_base]
 mixin-preset=
diff --git a/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py b/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py
index 9450eee9c9b95..920915b26d043 100644
--- a/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py
+++ b/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py
@@ -36,7 +36,7 @@ def is_before_build_script_impl_product(cls):
     def should_build(self, host_target):
         # Temporarily disable for non-darwin since this build never works
         # outside of that case currently.
-        if sys.platform != 'darwin':
+        if sys.platform != 'darwin' and sys.platform != 'linux':
             return False
 
         if self.args.build_early_swiftsyntax:
@@ -73,18 +73,10 @@ def test(self, host_target):
         pass
 
     def should_install(self, host_target):
-        """should_install() -> Bool
-
-        Whether or not this product should be installed with the given
-        arguments.
-        """
-        return self.should_build(host_target) and self.args.install_swiftsyntax
+        # The artifacts are copied to build directory of 'swift' and are
+        # installed as a part of 'swift' product.
+        return False
 
     def install(self, host_target):
-        """
-        Perform the install phase for the product.
-
-        This phase might copy the artifacts from the previous phases into a
-        destination directory.
-        """
-        self.install_with_cmake(["install"], self.host_install_destdir(host_target))
+        # No-op.
+        None

From 2a2787b2d0cdd45486e98a7cf19da4208b9ebb61 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Thu, 24 Aug 2023 22:54:47 +0000
Subject: [PATCH 02/12] Avoid adding redundant temporary RUNPATH to builder's
 stdlib

Many shared libs and executables are only run after stdlib/runtime are
built. They don't need to link with builders stdlib at all.
---
 cmake/modules/AddPureSwift.cmake              |  3 +-
 cmake/modules/AddSwift.cmake                  | 58 +++++++++++++++----
 cmake/modules/AddSwiftUnittests.cmake         |  2 +-
 lib/Macros/CMakeLists.txt                     |  6 --
 lib/SwiftDemangle/CMakeLists.txt              |  7 ---
 .../cmake/modules/AddSwiftSourceKit.cmake     |  8 ---
 .../tools/complete-test/CMakeLists.txt        |  6 --
 .../tools/sourcekitd-repl/CMakeLists.txt      |  6 --
 .../tools/sourcekitd-test/CMakeLists.txt      |  6 --
 tools/driver/CMakeLists.txt                   |  3 +
 tools/libStaticMirror/CMakeLists.txt          |  6 --
 tools/libSwiftScan/CMakeLists.txt             |  6 --
 .../CMakeLists.txt                            |  1 +
 .../CMakeLists.txt                            |  1 +
 tools/swift-plugin-server/CMakeLists.txt      |  5 --
 .../CMakeLists.txt                            |  1 +
 16 files changed, 56 insertions(+), 69 deletions(-)

diff --git a/cmake/modules/AddPureSwift.cmake b/cmake/modules/AddPureSwift.cmake
index 401fdeb4e46bd..7305c4f31cfe8 100644
--- a/cmake/modules/AddPureSwift.cmake
+++ b/cmake/modules/AddPureSwift.cmake
@@ -80,8 +80,7 @@ function(_set_pure_swift_link_flags name relpath_to_lib_dir)
       APPEND PROPERTY INSTALL_RPATH
         # At runtime, use swiftCore in the current toolchain.
         "$ORIGIN/${relpath_to_lib_dir}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
-        # But before building the stdlib with the tool, use the builder libs. This should be removed in install time.
-        "${host_lib_dir}")
+    )
 
   endif()
 endfunction()
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
index 1f0030339034a..3fcb52afe7a57 100644
--- a/cmake/modules/AddSwift.cmake
+++ b/cmake/modules/AddSwift.cmake
@@ -440,7 +440,7 @@ function(_add_host_variant_link_flags target)
   endif()
 endfunction()
 
-function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
+function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping required_for_minimal_compiler)
   if(NOT BOOTSTRAPPING_MODE)
     if (SWIFT_SWIFT_PARSER)
       set(ASRLF_BOOTSTRAPPING_MODE "HOSTTOOLS")
@@ -553,7 +553,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
       # FIXME: This assumes the ABI hasn't changed since the builder.
       set(swift_runtime_rpath "$ORIGIN/${relpath_to_lib_dir}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
 
-      if(ASRLF_BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
+      if(ASRLF_BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND required_for_minimal_compiler)
         # But before building the stdlib with the tool, use the builder libs. This should be removed in install time.
         list(APPEND swift_runtime_rpath "${host_lib_dir}")
       endif()
@@ -745,7 +745,7 @@ function(add_swift_host_library name)
   _set_target_prefix_and_suffix(${name} "${libkind}" "${SWIFT_HOST_VARIANT_SDK}")
 
   if (ASHL_SHARED AND ASHL_HAS_SWIFT_MODULES)
-      _add_swift_runtime_link_flags(${name} "." "")
+      _add_swift_runtime_link_flags(${name} "." "" FALSE)
   endif()
 
   # Set compilation and link flags.
@@ -833,8 +833,44 @@ macro(add_swift_lib_subdirectory name)
   add_llvm_subdirectory(SWIFT LIB ${name})
 endmacro()
 
+# Add a new Swift host executable.
+#
+# Usage:
+#   add_swift_host_tool(name
+#     [HAS_SWIFT_MODULES]
+#     [THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY]
+#     [REQUIRED_FOR_MINIMAL_COMPILER]
+#
+#     [BOOTSTRAPPING 0|1]
+#     [SWIFT_COMPONENT component]
+#     [LLVM_LINK_COMPONENTS comp1 ...]
+#     source1 [source2 source3 ...])
+#
+# name
+#   Name of the executable (e.g., swift-frontend).
+#
+# HAS_SWIFT_MODULES
+#   Whether to link with SwiftCompilerSources library
+#
+# THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
+#   Opt-out of LLVM IR optimizations when linking ThinLTO with ld64
+#
+# REQUIRED_FOR_MINIMAL_COMPILER
+#   Required for building standard libraries.
+#
+# BOOTSTRAPPING
+#   Bootstrapping stage.
+#
+# SWIFT_COMPONENT
+#   Installation component where this tool belongs to.
+#
+# LLVM_LINK_COMPONENTS
+#   LLVM components this library depends on.
+#
+# source1 ...
+#   Sources to add into this executable.
 function(add_swift_host_tool executable)
-  set(options HAS_SWIFT_MODULES THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY)
+  set(options HAS_SWIFT_MODULES THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY REQUIRED_FOR_MINIMAL_COMPILER)
   set(single_parameter_options SWIFT_COMPONENT BOOTSTRAPPING)
   set(multiple_parameter_options LLVM_LINK_COMPONENTS)
 
@@ -895,7 +931,7 @@ function(add_swift_host_tool executable)
   endif()
 
   if (ASHT_HAS_SWIFT_MODULES)
-      _add_swift_runtime_link_flags(${executable} "../lib" "${ASHT_BOOTSTRAPPING}")
+    _add_swift_runtime_link_flags(${executable} "../lib" "${ASHT_BOOTSTRAPPING}" "${ASHT_REQUIRED_FOR_MINIMAL_COMPILER}")
   endif()
 
   llvm_update_compile_flags(${executable})
@@ -971,11 +1007,13 @@ function(add_swift_host_tool executable)
                                  COMPONENT ${ASHT_SWIFT_COMPONENT}
     )
 
-    swift_install_strip_builder_rpath(
-      TARGETS ${executable}
-      DESTINATION bin
-      COMPONENT ${ASHT_SWIFT_COMPONENT}
-    )
+    if (ASHT_REQUIRED_FOR_MINIMAL_COMPILER)
+      swift_install_strip_builder_rpath(
+        TARGETS ${executable}
+        DESTINATION bin
+        COMPONENT ${ASHT_SWIFT_COMPONENT}
+      )
+    endif()
 
     swift_is_installing_component(${ASHT_SWIFT_COMPONENT} is_installing)
   endif()
diff --git a/cmake/modules/AddSwiftUnittests.cmake b/cmake/modules/AddSwiftUnittests.cmake
index 45acb9bf10698..26d7a024a044c 100644
--- a/cmake/modules/AddSwiftUnittests.cmake
+++ b/cmake/modules/AddSwiftUnittests.cmake
@@ -113,7 +113,7 @@ function(add_swift_unittest test_dirname)
 
   if (SWIFT_SWIFT_PARSER AND NOT ASU_IS_TARGET_TEST)
     # Link to stdlib the compiler uses.
-    _add_swift_runtime_link_flags(${test_dirname} "../../lib" "")
+    _add_swift_runtime_link_flags(${test_dirname} "../../lib" "" FALSE)
     set_property(TARGET ${test_dirname} PROPERTY BUILD_WITH_INSTALL_RPATH OFF)
   endif()
 endfunction()
diff --git a/lib/Macros/CMakeLists.txt b/lib/Macros/CMakeLists.txt
index 4f15512d0e315..dc61d9a904488 100644
--- a/lib/Macros/CMakeLists.txt
+++ b/lib/Macros/CMakeLists.txt
@@ -67,12 +67,6 @@ function(add_swift_macro_library name)
       DESTINATION "${destination_dir}"
       COMPONENT compiler)
 
-  swift_install_strip_builder_rpath(
-    TARGETS ${name}
-    DESTINATION "${destination_dir}"
-    COMPONENT compiler
-  )
-
   # Export this macro plugin target.
   set_property(GLOBAL APPEND PROPERTY SWIFT_MACRO_PLUGINS ${name})
 endfunction()
diff --git a/lib/SwiftDemangle/CMakeLists.txt b/lib/SwiftDemangle/CMakeLists.txt
index 9b14ba3f75de8..864bea94cc167 100644
--- a/lib/SwiftDemangle/CMakeLists.txt
+++ b/lib/SwiftDemangle/CMakeLists.txt
@@ -17,10 +17,3 @@ swift_install_in_component(TARGETS swiftDemangle
   ARCHIVE
     DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
     COMPONENT compiler)
-
-
-swift_install_strip_builder_rpath(
-  TARGETS swiftDemangle
-  DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
-  COMPONENT compiler
-)
diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
index 909fc56ec72c7..683937cc21f71 100644
--- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
+++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
@@ -303,14 +303,6 @@ macro(add_sourcekit_library name)
       DESTINATION "bin"
       COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}")
 
-  if(SOURCEKITLIB_SHARED)
-    swift_install_strip_builder_rpath(
-      TARGETS ${name}
-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
-      COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}"
-    )
-  endif()
-
   swift_install_in_component(FILES ${SOURCEKITLIB_HEADERS}
                              DESTINATION "include/SourceKit"
                              COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}")
diff --git a/tools/SourceKit/tools/complete-test/CMakeLists.txt b/tools/SourceKit/tools/complete-test/CMakeLists.txt
index b1970fc26c197..d1b3fe3b36a8f 100644
--- a/tools/SourceKit/tools/complete-test/CMakeLists.txt
+++ b/tools/SourceKit/tools/complete-test/CMakeLists.txt
@@ -27,9 +27,3 @@ endif()
 add_dependencies(tools complete-test)
 swift_install_in_component(TARGETS complete-test
   RUNTIME DESTINATION bin COMPONENT tools)
-
-swift_install_strip_builder_rpath(
-  TARGETS complete-test
-  DESTINATION bin
-  COMPONENT tools
-)
diff --git a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
index 1f459f1617787..f8cea3683f071 100644
--- a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
+++ b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
@@ -29,9 +29,3 @@ endif()
 add_dependencies(tools sourcekitd-repl)
 swift_install_in_component(TARGETS sourcekitd-repl
   RUNTIME DESTINATION bin COMPONENT tools)
-
-swift_install_strip_builder_rpath(
-  TARGETS sourcekitd-repl
-  DESTINATION bin
-  COMPONENT tools
-)
diff --git a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
index d20060a014303..e5f7aa5c9fba5 100644
--- a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
+++ b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
@@ -39,9 +39,3 @@ endif()
 add_dependencies(tools sourcekitd-test)
 swift_install_in_component(TARGETS sourcekitd-test
   RUNTIME DESTINATION bin COMPONENT tools)
-
-swift_install_strip_builder_rpath(
-  TARGETS sourcekitd-test
-  DESTINATION bin
-  COMPONENT tools
-)
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 16a194da9b5f9..5659716edf0ae 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -26,6 +26,7 @@ if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
     HAS_SWIFT_MODULES
     BOOTSTRAPPING 0
     THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
+    REQUIRED_FOR_MINIMAL_COMPILER
   )
   target_link_libraries(swift-frontend-bootstrapping0
                         PRIVATE
@@ -47,6 +48,7 @@ if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
     HAS_SWIFT_MODULES
     BOOTSTRAPPING 1
     THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
+    REQUIRED_FOR_MINIMAL_COMPILER
   )
   target_link_libraries(swift-frontend-bootstrapping1
                         PRIVATE
@@ -65,6 +67,7 @@ add_swift_host_tool(swift-frontend
   driver.cpp
   SWIFT_COMPONENT compiler
   HAS_SWIFT_MODULES
+  REQUIRED_FOR_MINIMAL_COMPILER
 )
 target_link_libraries(swift-frontend
                       PUBLIC
diff --git a/tools/libStaticMirror/CMakeLists.txt b/tools/libStaticMirror/CMakeLists.txt
index e429fa2ef8090..1b8c563b05aae 100644
--- a/tools/libStaticMirror/CMakeLists.txt
+++ b/tools/libStaticMirror/CMakeLists.txt
@@ -37,9 +37,3 @@ swift_install_in_component(TARGETS libStaticMirror
 swift_install_in_component(DIRECTORY "${SWIFT_MAIN_INCLUDE_DIR}/swift-c/StaticMirror/"
                            DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SCAN_LIB_NAME}"
                            COMPONENT static-mirror-lib)
-
-swift_install_strip_builder_rpath(
-  TARGETS libStaticMirror
-  DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
-  COMPONENT static-mirror-lib
-)
diff --git a/tools/libSwiftScan/CMakeLists.txt b/tools/libSwiftScan/CMakeLists.txt
index 79bb9f0086016..4d51ffdf142d7 100644
--- a/tools/libSwiftScan/CMakeLists.txt
+++ b/tools/libSwiftScan/CMakeLists.txt
@@ -69,12 +69,6 @@ else()
     LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
     RUNTIME DESTINATION "bin" COMPONENT compiler)
 
-  swift_install_strip_builder_rpath(
-    TARGETS libSwiftScan
-    DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
-    COMPONENT compiler
-  )
-
   # Create a symlink to previously-used path of 'lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}'
   # to the new location under 'lib/swift/host' for clients of the legacy path.
   if(EXISTS ${LLVM_CMAKE_DIR}/LLVMInstallSymlink.cmake)
diff --git a/tools/swift-compatibility-symbols/CMakeLists.txt b/tools/swift-compatibility-symbols/CMakeLists.txt
index e28de9182cf4f..9de52ab844cc8 100644
--- a/tools/swift-compatibility-symbols/CMakeLists.txt
+++ b/tools/swift-compatibility-symbols/CMakeLists.txt
@@ -2,6 +2,7 @@ add_swift_host_tool(swift-compatibility-symbols
   swift-compatibility-symbols.cpp
   LLVM_LINK_COMPONENTS support
   SWIFT_COMPONENT tools
+  REQUIRED_FOR_MINIMAL_COMPILER
 )
 
 set(syms_file "${CMAKE_BINARY_DIR}/share/swift/compatibility-symbols")
diff --git a/tools/swift-def-to-strings-converter/CMakeLists.txt b/tools/swift-def-to-strings-converter/CMakeLists.txt
index 2bfd9145a5a30..3d5406ce6f97c 100644
--- a/tools/swift-def-to-strings-converter/CMakeLists.txt
+++ b/tools/swift-def-to-strings-converter/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_swift_host_tool(swift-def-to-strings-converter
   swift-def-to-strings-converter.cpp
   SWIFT_COMPONENT tools
+  REQUIRED_FOR_MINIMAL_COMPILER
 )
 
 target_link_libraries(swift-def-to-strings-converter PRIVATE
diff --git a/tools/swift-plugin-server/CMakeLists.txt b/tools/swift-plugin-server/CMakeLists.txt
index 9997b964d9347..09332309b10c9 100644
--- a/tools/swift-plugin-server/CMakeLists.txt
+++ b/tools/swift-plugin-server/CMakeLists.txt
@@ -30,9 +30,4 @@ if (SWIFT_SWIFT_PARSER)
       DESTINATION bin
       COMPONENT compiler
   )
-  swift_install_strip_builder_rpath(
-    TARGETS swift-plugin-server
-    DESTINATION bin
-    COMPONENT compiler
-  )
 endif()
diff --git a/tools/swift-serialize-diagnostics/CMakeLists.txt b/tools/swift-serialize-diagnostics/CMakeLists.txt
index 4a1ab49b59ed3..106f3e2c087d3 100644
--- a/tools/swift-serialize-diagnostics/CMakeLists.txt
+++ b/tools/swift-serialize-diagnostics/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_swift_host_tool(swift-serialize-diagnostics
   swift-serialize-diagnostics.cpp
   SWIFT_COMPONENT tools
+  REQUIRED_FOR_MINIMAL_COMPILER
 )
 target_link_libraries(swift-serialize-diagnostics PRIVATE
   swiftLocalization)

From 0f0c4925ae2a70c635f4ad881991d937658b5b63 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Thu, 24 Aug 2023 23:05:24 +0000
Subject: [PATCH 03/12] [CMake] Fatal error when bootstrapping is not
 "hosttools"

and Swift parser integration is enabled.
If swift parser integration is enabled, SwiftSyntax libraries are always
built with host tools. Other SwiftCompilerSources modules must use the
same runtime with parser libraries.
---
 CMakeLists.txt                                        | 4 ++++
 tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8e072d218c02..dbf6c2b349f83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -953,6 +953,10 @@ if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
   else()
     set(SWIFT_SWIFT_PARSER TRUE)
     include(${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS})
+
+    if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
+      message(FATAL_ERROR "Only BOOTSTRAPPING=HOSTTOOLS is supported in Linux when Swift parser integration is enabled")
+    endif()
   endif()
 endif()
 
diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
index 683937cc21f71..32ab46640a960 100644
--- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
+++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
@@ -132,10 +132,8 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
 
       file(RELATIVE_PATH relative_rtlib_path "${path}" "${SWIFTLIB_DIR}/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
       list(APPEND RPATH_LIST "$ORIGIN/${relative_rtlib_path}")
-
-      if(ASKD_BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
-        list(APPEND RPATH_LIST "${host_lib_dir}")
-      endif()
+      # NOTE: SourceKit components are NOT executed before stdlib is built.
+      # So there's no need to add RUNPATH to builder's runtime libraries.
 
     elseif(ASKD_BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
       get_bootstrapping_swift_lib_dir(bs_lib_dir "")

From 9017ef51ce14f478adf2ec2640a24f3d7ce40aee Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Fri, 25 Aug 2023 21:58:38 +0000
Subject: [PATCH 04/12] [CMake] Update for review comments

---
 CMakeLists.txt                                      |  4 +++-
 cmake/modules/AddPureSwift.cmake                    | 13 ++++++-------
 tools/driver/CMakeLists.txt                         |  2 --
 utils/build-presets.ini                             |  3 +--
 .../products/earlyswiftsyntax.py                    |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbf6c2b349f83..897c318029109 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -955,7 +955,9 @@ if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
     include(${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS})
 
     if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
-      message(FATAL_ERROR "Only BOOTSTRAPPING=HOSTTOOLS is supported in Linux when Swift parser integration is enabled")
+      # Only "HOSTTOOLS" is supported in Linux when Swift parser integration is enabled.
+      message(WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled")
+      set(BOOTSTRAPPING_MODE "HOSTTOOLS")
     endif()
   endif()
 endif()
diff --git a/cmake/modules/AddPureSwift.cmake b/cmake/modules/AddPureSwift.cmake
index 7305c4f31cfe8..388b9000d2988 100644
--- a/cmake/modules/AddPureSwift.cmake
+++ b/cmake/modules/AddPureSwift.cmake
@@ -67,21 +67,20 @@ endfunction()
 
 function(_set_pure_swift_link_flags name relpath_to_lib_dir)
   if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
-    # Don't add builder's stdlib RPATH automatically, because we want to *de-prioritize* it.
+    # Don't add builder's stdlib RPATH automatically.
     target_compile_options(${name} PRIVATE
       $<$<COMPILE_LANGUAGE:Swift>:-no-toolchain-stdlib-rpath>
     )
 
-    get_filename_component(swift_bin_dir ${CMAKE_Swift_COMPILER} DIRECTORY)
-    get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
-    set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
-
     set_property(TARGET ${name}
       APPEND PROPERTY INSTALL_RPATH
-        # At runtime, use swiftCore in the current toolchain.
+        # At runtime, use swiftCore in the current just-built toolchain.
+        # NOTE: This relies on the ABI being the same as the builder.
         "$ORIGIN/${relpath_to_lib_dir}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
     )
-
+    # NOTE: At this point we don't have any pure swift executables/shared
+    # libraries required for building runtime/stdlib. So we don't need to add
+    # RPATH to the builder's runtime.
   endif()
 endfunction()
 
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 5659716edf0ae..5d504b8cf0179 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -26,7 +26,6 @@ if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
     HAS_SWIFT_MODULES
     BOOTSTRAPPING 0
     THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
-    REQUIRED_FOR_MINIMAL_COMPILER
   )
   target_link_libraries(swift-frontend-bootstrapping0
                         PRIVATE
@@ -48,7 +47,6 @@ if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
     HAS_SWIFT_MODULES
     BOOTSTRAPPING 1
     THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
-    REQUIRED_FOR_MINIMAL_COMPILER
   )
   target_link_libraries(swift-frontend-bootstrapping1
                         PRIVATE
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 11ad09d2fa685..f291bff90127f 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -859,6 +859,7 @@ install-lldb
 install-llbuild
 install-swiftpm
 install-swift-driver
+install-swiftsyntax
 install-xctest
 install-libicu
 install-prefix=/usr
@@ -889,8 +890,6 @@ installable-package=%(installable_package)s
 # in Linux CI bots
 relocate-xdg-cache-home-under-build-subdir
 
-# Linux only support 'hosttools' with early-swiftsyntax.
-bootstrapping=hosttools
 
 [preset: buildbot_linux_base]
 mixin-preset=
diff --git a/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py b/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py
index 920915b26d043..e9b68b02872fc 100644
--- a/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py
+++ b/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py
@@ -79,4 +79,4 @@ def should_install(self, host_target):
 
     def install(self, host_target):
         # No-op.
-        None
+        pass

From 914a6fdf7aad9927018940b2c806f1492a4fc938 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Fri, 25 Aug 2023 22:37:34 +0000
Subject: [PATCH 05/12] [CMake] Fix weiredness in swift runtime linking for
 SourceKit libraries

SourceKit components are never built while bootstrapping stages. So it
doen't need to have stage 0 or 1 handling.
---
 .../cmake/modules/AddSwiftSourceKit.cmake     | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
index 32ab46640a960..47e89f08f78f0 100644
--- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
+++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
@@ -154,9 +154,6 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
   endif()
 
   if(SWIFT_SWIFT_PARSER)
-    # Make sure we can find the early SwiftSyntax libraries.
-    target_link_directories(${target} PRIVATE "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/lib/swift/host")
-
     # Add rpath to the host Swift libraries.
     if (NOT SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
       file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host")
@@ -166,25 +163,16 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
     # For the "end step" of bootstrapping configurations on Darwin, need to be
     # able to fall back to the SDK directory for libswiftCore et al.
     if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
-      if (NOT "${bootstrapping}" STREQUAL "1")
-        if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
-          target_link_directories(${target} PRIVATE "${sdk_dir}")
-
-          # Include the abi stable system stdlib in our rpath.
-          set(swift_runtime_rpath "/usr/lib/swift")
-
-          # Add in the toolchain directory so we can grab compatibility libraries
-          get_filename_component(TOOLCHAIN_BIN_DIR ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)
-          get_filename_component(TOOLCHAIN_LIB_DIR "${TOOLCHAIN_BIN_DIR}/../lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" ABSOLUTE)
-          target_link_directories(${target} PUBLIC ${TOOLCHAIN_LIB_DIR})
-        else()
-          get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)
-          get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
-          set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
-          target_link_directories(${target} PUBLIC ${host_lib_dir})
-
-          list(APPEND RPATH_LIST "${host_lib_dir}")
-        endif()
+      if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
+        target_link_directories(${target} PRIVATE "${sdk_dir}")
+
+        # Include the abi stable system stdlib in our rpath.
+        set(swift_runtime_rpath "/usr/lib/swift")
+
+        # Add in the toolchain directory so we can grab compatibility libraries
+        get_filename_component(TOOLCHAIN_BIN_DIR ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)
+        get_filename_component(TOOLCHAIN_LIB_DIR "${TOOLCHAIN_BIN_DIR}/../lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" ABSOLUTE)
+        target_link_directories(${target} PUBLIC ${TOOLCHAIN_LIB_DIR})
       endif()
     endif()
   endif()

From 602604be7416197cbb412972a6db5bd90d70764e Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Fri, 25 Aug 2023 23:41:27 +0000
Subject: [PATCH 06/12] [CMake] Further cleanup for RUNPATH setting

`$ORIGIN` is only supported in Linux, BSD, etc. (i.e. not in Windows)
---
 tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
index 47e89f08f78f0..563df1a114d58 100644
--- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
+++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
@@ -151,15 +151,15 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)
     else()
       message(FATAL_ERROR "Unknown ASKD_BOOTSTRAPPING_MODE '${ASKD_BOOTSTRAPPING_MODE}'")
     endif()
-  endif()
 
-  if(SWIFT_SWIFT_PARSER)
-    # Add rpath to the host Swift libraries.
-    if (NOT SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
+    if(SWIFT_SWIFT_PARSER)
+      # Add rpath to the host Swift libraries.
       file(RELATIVE_PATH relative_hostlib_path "${path}" "${SWIFTLIB_DIR}/host")
       list(APPEND RPATH_LIST "$ORIGIN/${relative_hostlib_path}")
     endif()
+  endif()
 
+  if(SWIFT_SWIFT_PARSER)
     # For the "end step" of bootstrapping configurations on Darwin, need to be
     # able to fall back to the SDK directory for libswiftCore et al.
     if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

From 757aaa347d288c98c2514c95e025e21c2e149f53 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Mon, 28 Aug 2023 01:16:18 +0000
Subject: [PATCH 07/12] [CMake] Set LD_LIBRARY_PATH to builder's runtime when
 building stdlib

In Linux. Instead of setting temporary "fallback" RUNPATH, Set
LD_LIBRARY_PATH to builder's runtime when building standard library.
So we don't need to strip the temporary RUNPATH when installing.
---
 CMakeLists.txt                                |  2 +-
 cmake/modules/AddSwift.cmake                  | 26 ++-----
 cmake/modules/AddSwiftUnittests.cmake         |  2 +-
 cmake/modules/SetRPATH.cmake                  | 16 +++++
 cmake/modules/SwiftStripBuilderRpath.cmake    | 71 -------------------
 cmake/modules/SwiftUtils.cmake                | 10 +++
 lib/CMakeLists.txt                            | 13 +---
 tools/driver/CMakeLists.txt                   |  1 -
 .../CMakeLists.txt                            |  1 -
 .../CMakeLists.txt                            |  1 -
 .../CMakeLists.txt                            |  1 -
 11 files changed, 34 insertions(+), 110 deletions(-)
 create mode 100644 cmake/modules/SetRPATH.cmake
 delete mode 100644 cmake/modules/SwiftStripBuilderRpath.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 897c318029109..83992cea68e04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -794,7 +794,7 @@ include(SwiftConfigureSDK)
 include(SwiftComponents)
 include(SwiftList)
 include(AddPureSwift)
-include(SwiftStripBuilderRpath)
+include(SetRPATH)
 
 # Configure swift include, install, build components.
 swift_configure_components()
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
index 3fcb52afe7a57..744b5e91d8821 100644
--- a/cmake/modules/AddSwift.cmake
+++ b/cmake/modules/AddSwift.cmake
@@ -440,7 +440,7 @@ function(_add_host_variant_link_flags target)
   endif()
 endfunction()
 
-function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping required_for_minimal_compiler)
+function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
   if(NOT BOOTSTRAPPING_MODE)
     if (SWIFT_SWIFT_PARSER)
       set(ASRLF_BOOTSTRAPPING_MODE "HOSTTOOLS")
@@ -550,14 +550,10 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping r
       target_link_directories(${target} PRIVATE ${host_lib_dir})
 
       # At runtime, use swiftCore in the current toolchain.
+      # For building stdlib, LD_LIBRARY_PATH will be set to builder's stdlib
       # FIXME: This assumes the ABI hasn't changed since the builder.
       set(swift_runtime_rpath "$ORIGIN/${relpath_to_lib_dir}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
 
-      if(ASRLF_BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND required_for_minimal_compiler)
-        # But before building the stdlib with the tool, use the builder libs. This should be removed in install time.
-        list(APPEND swift_runtime_rpath "${host_lib_dir}")
-      endif()
-
     elseif(ASRLF_BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
       # At build time link against the built swift libraries from the
       # previous bootstrapping stage.
@@ -745,7 +741,7 @@ function(add_swift_host_library name)
   _set_target_prefix_and_suffix(${name} "${libkind}" "${SWIFT_HOST_VARIANT_SDK}")
 
   if (ASHL_SHARED AND ASHL_HAS_SWIFT_MODULES)
-      _add_swift_runtime_link_flags(${name} "." "" FALSE)
+      _add_swift_runtime_link_flags(${name} "." "")
   endif()
 
   # Set compilation and link flags.
@@ -839,7 +835,6 @@ endmacro()
 #   add_swift_host_tool(name
 #     [HAS_SWIFT_MODULES]
 #     [THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY]
-#     [REQUIRED_FOR_MINIMAL_COMPILER]
 #
 #     [BOOTSTRAPPING 0|1]
 #     [SWIFT_COMPONENT component]
@@ -855,9 +850,6 @@ endmacro()
 # THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
 #   Opt-out of LLVM IR optimizations when linking ThinLTO with ld64
 #
-# REQUIRED_FOR_MINIMAL_COMPILER
-#   Required for building standard libraries.
-#
 # BOOTSTRAPPING
 #   Bootstrapping stage.
 #
@@ -870,7 +862,7 @@ endmacro()
 # source1 ...
 #   Sources to add into this executable.
 function(add_swift_host_tool executable)
-  set(options HAS_SWIFT_MODULES THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY REQUIRED_FOR_MINIMAL_COMPILER)
+  set(options HAS_SWIFT_MODULES THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY)
   set(single_parameter_options SWIFT_COMPONENT BOOTSTRAPPING)
   set(multiple_parameter_options LLVM_LINK_COMPONENTS)
 
@@ -931,7 +923,7 @@ function(add_swift_host_tool executable)
   endif()
 
   if (ASHT_HAS_SWIFT_MODULES)
-    _add_swift_runtime_link_flags(${executable} "../lib" "${ASHT_BOOTSTRAPPING}" "${ASHT_REQUIRED_FOR_MINIMAL_COMPILER}")
+    _add_swift_runtime_link_flags(${executable} "../lib" "${ASHT_BOOTSTRAPPING}")
   endif()
 
   llvm_update_compile_flags(${executable})
@@ -1007,14 +999,6 @@ function(add_swift_host_tool executable)
                                  COMPONENT ${ASHT_SWIFT_COMPONENT}
     )
 
-    if (ASHT_REQUIRED_FOR_MINIMAL_COMPILER)
-      swift_install_strip_builder_rpath(
-        TARGETS ${executable}
-        DESTINATION bin
-        COMPONENT ${ASHT_SWIFT_COMPONENT}
-      )
-    endif()
-
     swift_is_installing_component(${ASHT_SWIFT_COMPONENT} is_installing)
   endif()
 
diff --git a/cmake/modules/AddSwiftUnittests.cmake b/cmake/modules/AddSwiftUnittests.cmake
index 26d7a024a044c..45acb9bf10698 100644
--- a/cmake/modules/AddSwiftUnittests.cmake
+++ b/cmake/modules/AddSwiftUnittests.cmake
@@ -113,7 +113,7 @@ function(add_swift_unittest test_dirname)
 
   if (SWIFT_SWIFT_PARSER AND NOT ASU_IS_TARGET_TEST)
     # Link to stdlib the compiler uses.
-    _add_swift_runtime_link_flags(${test_dirname} "../../lib" "" FALSE)
+    _add_swift_runtime_link_flags(${test_dirname} "../../lib" "")
     set_property(TARGET ${test_dirname} PROPERTY BUILD_WITH_INSTALL_RPATH OFF)
   endif()
 endfunction()
diff --git a/cmake/modules/SetRPATH.cmake b/cmake/modules/SetRPATH.cmake
new file mode 100644
index 0000000000000..f843e5df40bb3
--- /dev/null
+++ b/cmake/modules/SetRPATH.cmake
@@ -0,0 +1,16 @@
+set(SWIFT_SET_RPATH_SCRIPT_FILE "${CMAKE_CURRENT_LIST_FILE}")
+
+function(swift_get_set_rpath_script_file out_var)
+  set(${out_var} "${SWIFT_SET_RPATH_SCRIPT_FILE}" PARENT_SCOPE)
+endfunction()
+
+# Actual RPATH_SET operation to the file.
+function(_swift_set_rpath_impl file new_rpath)
+  # NOTE: RPATH_SET is not documented, and works only for ELF and XCOFF. 
+  file(RPATH_SET FILE "${file}" NEW_RPATH "${new_rpath}")
+endfunction()
+
+# For 'cmake -P <scirpt>'.
+if (SWIFT_SET_RPATH_FILE AND SWIFT_SET_RPATH_NEW_RPATH)
+  _swift_set_rpath_impl("${SWIFT_SET_RPATH_FILE}" "${SWIFT_SET_RPATH_NEW_RPATH}")
+endif()
diff --git a/cmake/modules/SwiftStripBuilderRpath.cmake b/cmake/modules/SwiftStripBuilderRpath.cmake
deleted file mode 100644
index 8df406b0388df..0000000000000
--- a/cmake/modules/SwiftStripBuilderRpath.cmake
+++ /dev/null
@@ -1,71 +0,0 @@
-set(SWIFT_SET_RPATH_SCRIPT_FILE "${CMAKE_CURRENT_LIST_FILE}")
-
-function(swift_get_set_rpath_script_file out_var)
-  set(${out_var} "${SWIFT_SET_RPATH_SCRIPT_FILE}" PARENT_SCOPE)
-endfunction()
-
-# Actual RPATH_SET operation to the file.
-function(_swift_set_rpath_impl file new_rpath)
-  # NOTE: RPATH_SET is not documented, and works only for ELF and XCOFF. 
-  file(RPATH_SET FILE "${file}" NEW_RPATH "${new_rpath}")
-endfunction()
-
-# For 'install(SCRIPT <script> CODE swift_set_rpath(...)'.
-function(_swift_file_set_rpath_installed file new_rpath)
-  set(DESTDIR $ENV{DESTDIR})
-  if(NOT IS_ABSOLUTE "${file}")
-    string(PREPEND file "${CMAKE_INSTALL_PREFIX}/")
-  endif()
-  string(PREPEND file "${DESTDIR}")
-  _swift_set_rpath_impl("${file}" "${new_rpath}")
-endfunction()
-
-# Add 'install' script that set runtime path to the specified file.
-function(swift_install_file_set_rpath file install_rpath component)
-  if(NOT(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX"))
-      return()
-  endif()
-  if((NOT SWIFT_SWIFT_PARSER) AND NOT(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS"))
-      return()
-  endif()
-
-  swift_get_set_rpath_script_file(script)
-
-  swift_install_in_component(
-    SCRIPT "${script}" 
-    CODE "_swift_file_set_rpath_installed(\"${file}\" \"${install_rpath}\")"
-    COMPONENT ${component}
-  )
-endfunction()
-
-# Add 'install' script that set runtime path to the target but only startinig with '$ORIGIN'
-function(swift_install_strip_builder_rpath)
-  cmake_parse_arguments(RPATH
-                        ""
-                        "DESTINATION;COMPONENT"
-                        "TARGETS"
-                        ${ARGN})
-
-  foreach(target ${RPATH_TARGETS})
-    # Filter out RPATHs *not* starting with $ORIGIN
-    set(stripped_rpaths)
-    get_target_property(install_rpaths ${target} INSTALL_RPATH)
-    foreach(path ${install_rpaths})
-        if (path MATCHES "^\\$ORIGIN")
-        list(APPEND stripped_rpaths "${path}")
-        endif()
-    endforeach()
-
-    list(JOIN stripped_rpaths ":" install_rpath_str)
-    swift_install_file_set_rpath(
-      "${RPATH_DESTINATION}/$<TARGET_FILE_NAME:${target}>"
-      "${install_rpath_str}"
-      ${RPATH_COMPONENT}
-    )
-  endforeach()
-endfunction()
-
-# For 'cmake -P <scirpt>'.
-if (SWIFT_SET_RPATH_FILE AND SWIFT_SET_RPATH_NEW_RPATH)
-  _swift_set_rpath_impl("${SWIFT_SET_RPATH_FILE}" "${SWIFT_SET_RPATH_NEW_RPATH}")
-endif()
diff --git a/cmake/modules/SwiftUtils.cmake b/cmake/modules/SwiftUtils.cmake
index 9d6b2ce73af94..7e682f7f6471e 100644
--- a/cmake/modules/SwiftUtils.cmake
+++ b/cmake/modules/SwiftUtils.cmake
@@ -107,6 +107,16 @@ function(get_bootstrapping_swift_lib_dir bs_lib_dir bootstrapping)
     elseif("${bootstrapping}" STREQUAL "")
       get_bootstrapping_path(bs_lib_dir ${lib_dir} "1")
     endif()
+  elseif(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
+    if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
+      # Compiler's INSTALL_RPATH is set to libs in the build directory
+      # For building stdlib, use stdlib in the builder's resource directory
+      # because the runtime may not be built yet.
+      # FIXME: This assumes the ABI hasn't changed since the builder.
+      get_filename_component(swift_bin_dir ${CMAKE_Swift_COMPILER} DIRECTORY)
+      get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
+      set(bs_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
+    endif()
   endif()
   set(bs_lib_dir ${bs_lib_dir} PARENT_SCOPE)
 endfunction()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index dabaeca5127f3..c9e220e4189ea 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -55,16 +55,11 @@ if (SWIFT_SWIFT_PARSER)
   foreach (sharedlib ${SWIFT_SYNTAX_SHARED_LIBRARIES})
     set(add_origin_rpath)
     if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
-      get_filename_component(swift_bin_dir ${CMAKE_Swift_COMPILER} DIRECTORY)
-      get_filename_component(swift_dir ${swift_bin_dir} DIRECTORY)
-      set(host_lib_dir "${swift_dir}/lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
-
       # At runtime, use swiftCore in the current toolchain.
-      
       swift_get_set_rpath_script_file(setrpath_command)
       set(add_origin_rpath COMMAND ${CMAKE_COMMAND}
         "-DSWIFT_SET_RPATH_FILE=${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}"
-        "-DSWIFT_SET_RPATH_NEW_RPATH='$$ORIGIN:$$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}:${host_lib_dir}'"
+        "-DSWIFT_SET_RPATH_NEW_RPATH='$$ORIGIN:$$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}'"
         -P "${setrpath_command}"
       )
     endif()
@@ -87,12 +82,6 @@ if (SWIFT_SWIFT_PARSER)
       COMPONENT compiler
     )
 
-    swift_install_file_set_rpath(
-      "lib${LLVM_LIBDIR_SUFFIX}/swift/host/${sharedlib}"
-      "$ORIGIN:$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
-      compiler
-    )
-
     add_dependencies(swiftSyntaxLibraries copy_swiftSyntaxLibrary_${sharedlib})
   endforeach()
 
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 5d504b8cf0179..16a194da9b5f9 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -65,7 +65,6 @@ add_swift_host_tool(swift-frontend
   driver.cpp
   SWIFT_COMPONENT compiler
   HAS_SWIFT_MODULES
-  REQUIRED_FOR_MINIMAL_COMPILER
 )
 target_link_libraries(swift-frontend
                       PUBLIC
diff --git a/tools/swift-compatibility-symbols/CMakeLists.txt b/tools/swift-compatibility-symbols/CMakeLists.txt
index 9de52ab844cc8..e28de9182cf4f 100644
--- a/tools/swift-compatibility-symbols/CMakeLists.txt
+++ b/tools/swift-compatibility-symbols/CMakeLists.txt
@@ -2,7 +2,6 @@ add_swift_host_tool(swift-compatibility-symbols
   swift-compatibility-symbols.cpp
   LLVM_LINK_COMPONENTS support
   SWIFT_COMPONENT tools
-  REQUIRED_FOR_MINIMAL_COMPILER
 )
 
 set(syms_file "${CMAKE_BINARY_DIR}/share/swift/compatibility-symbols")
diff --git a/tools/swift-def-to-strings-converter/CMakeLists.txt b/tools/swift-def-to-strings-converter/CMakeLists.txt
index 3d5406ce6f97c..2bfd9145a5a30 100644
--- a/tools/swift-def-to-strings-converter/CMakeLists.txt
+++ b/tools/swift-def-to-strings-converter/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_swift_host_tool(swift-def-to-strings-converter
   swift-def-to-strings-converter.cpp
   SWIFT_COMPONENT tools
-  REQUIRED_FOR_MINIMAL_COMPILER
 )
 
 target_link_libraries(swift-def-to-strings-converter PRIVATE
diff --git a/tools/swift-serialize-diagnostics/CMakeLists.txt b/tools/swift-serialize-diagnostics/CMakeLists.txt
index 106f3e2c087d3..4a1ab49b59ed3 100644
--- a/tools/swift-serialize-diagnostics/CMakeLists.txt
+++ b/tools/swift-serialize-diagnostics/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_swift_host_tool(swift-serialize-diagnostics
   swift-serialize-diagnostics.cpp
   SWIFT_COMPONENT tools
-  REQUIRED_FOR_MINIMAL_COMPILER
 )
 target_link_libraries(swift-serialize-diagnostics PRIVATE
   swiftLocalization)

From 319b8bd691d25c0a52664002efad268eec944cff Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Mon, 28 Aug 2023 09:51:22 -0700
Subject: [PATCH 08/12] [CMake] Fix install for macOS toolchain

recursive-lipo requires shared libraries have +x permissions.
Use PROGRAMS instead of FILES when installing swift-syntax libraries.
---
 lib/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index c9e220e4189ea..d73b22a8f5125 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -77,7 +77,7 @@ if (SWIFT_SWIFT_PARSER)
     )
 
     swift_install_in_component(
-      FILES "${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}"
+      PROGRAMS "${SWIFT_HOST_LIBRARIES_DEST_DIR}/${sharedlib}"
       DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host"
       COMPONENT compiler
     )

From 4ccc86661208d2874d89fdd83030f9f6ab0a4b39 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Mon, 28 Aug 2023 17:35:36 +0000
Subject: [PATCH 09/12] [CMake] Fix RUNPATH of lib_InternalSwiftScan in Linux

libSwiftScan is built in 'lib' but installed in 'lib/swift/host' RUNPATH
should have correct '$ORIGIN/../{platform}' to load 'swiftCore' runtime
library.
---
 tools/libSwiftScan/CMakeLists.txt | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/libSwiftScan/CMakeLists.txt b/tools/libSwiftScan/CMakeLists.txt
index 4d51ffdf142d7..1a99080337f84 100644
--- a/tools/libSwiftScan/CMakeLists.txt
+++ b/tools/libSwiftScan/CMakeLists.txt
@@ -30,6 +30,19 @@ set_target_properties(libSwiftScan
     PROPERTIES
     OUTPUT_NAME ${SWIFT_SCAN_LIB_NAME})
 
+if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD" AND BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
+  # Runtime INSTALL_RPATH are set by 'add_swift_host_library', but that expects
+  # libSwiftScan be installed in 'lib'. But since it's actually installed in 'lib/swift/host',
+  # we need to have correct runtime path to 'lib/swift/{platform}'.
+  # FIXME: BUILD_RPATH and INSTALL_PATH should be different
+  # FIXME: add_swift_host_library should accept 'DESTINATION' and handle installation
+  # FIXME: Build this library into 'lib/swift/host/' instead of 'lib/'
+  set_property(
+    TARGET libSwiftScan
+    APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
+  )
+endif()
+
 if(SWIFT_SWIFT_PARSER)
   if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
     # Ensure that we can find the host shared libraries.
@@ -39,7 +52,7 @@ if(SWIFT_SWIFT_PARSER)
     set_property(
       TARGET libSwiftScan
       APPEND PROPERTY INSTALL_RPATH "@loader_path/../host")
-  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
+  elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
     set_property(
       TARGET libSwiftScan
       APPEND PROPERTY INSTALL_RPATH "$ORIGIN/swift/host")

From dc6877334fb7bf33121fac75166313b25eebb600 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Mon, 28 Aug 2023 19:10:01 +0000
Subject: [PATCH 10/12] [CMake] Stop some exectuable link with swiftCore

swift-compatibility-symbols, swift-def-to-strings-converter,
and swift-serialize-diagnostics don't use any Swift modules. But when
SWIFT_SWIFT_PARSER was enabled, they are linked with swiftCore. But
these binaries can be executed before the runtime is being built.
We need to stop them linking with swiftCore.
---
 cmake/modules/AddSwift.cmake                        | 9 ++++++---
 tools/swift-compatibility-symbols/CMakeLists.txt    | 1 +
 tools/swift-def-to-strings-converter/CMakeLists.txt | 1 +
 tools/swift-serialize-diagnostics/CMakeLists.txt    | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
index 744b5e91d8821..b31370e4ac58b 100644
--- a/cmake/modules/AddSwift.cmake
+++ b/cmake/modules/AddSwift.cmake
@@ -833,7 +833,7 @@ endmacro()
 #
 # Usage:
 #   add_swift_host_tool(name
-#     [HAS_SWIFT_MODULES]
+#     [HAS_SWIFT_MODULES | DOES_NOT_USE_SWIFT]
 #     [THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY]
 #
 #     [BOOTSTRAPPING 0|1]
@@ -847,6 +847,9 @@ endmacro()
 # HAS_SWIFT_MODULES
 #   Whether to link with SwiftCompilerSources library
 #
+# DOES_NOT_USE_SWIFT
+#   Do not link with swift runtime
+#
 # THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY
 #   Opt-out of LLVM IR optimizations when linking ThinLTO with ld64
 #
@@ -862,7 +865,7 @@ endmacro()
 # source1 ...
 #   Sources to add into this executable.
 function(add_swift_host_tool executable)
-  set(options HAS_SWIFT_MODULES THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY)
+  set(options HAS_SWIFT_MODULES DOES_NOT_USE_SWIFT THINLTO_LD64_ADD_FLTO_CODEGEN_ONLY)
   set(single_parameter_options SWIFT_COMPONENT BOOTSTRAPPING)
   set(multiple_parameter_options LLVM_LINK_COMPONENTS)
 
@@ -918,7 +921,7 @@ function(add_swift_host_tool executable)
   endif()
 
   # Once the new Swift parser is linked in, every host tool has Swift modules.
-  if (SWIFT_SWIFT_PARSER)
+  if (SWIFT_SWIFT_PARSER AND NOT ASHT_DOES_NOT_USE_SWIFT)
     set(ASHT_HAS_SWIFT_MODULES ON)
   endif()
 
diff --git a/tools/swift-compatibility-symbols/CMakeLists.txt b/tools/swift-compatibility-symbols/CMakeLists.txt
index e28de9182cf4f..fff7ad8112af9 100644
--- a/tools/swift-compatibility-symbols/CMakeLists.txt
+++ b/tools/swift-compatibility-symbols/CMakeLists.txt
@@ -2,6 +2,7 @@ add_swift_host_tool(swift-compatibility-symbols
   swift-compatibility-symbols.cpp
   LLVM_LINK_COMPONENTS support
   SWIFT_COMPONENT tools
+  DOES_NOT_USE_SWIFT
 )
 
 set(syms_file "${CMAKE_BINARY_DIR}/share/swift/compatibility-symbols")
diff --git a/tools/swift-def-to-strings-converter/CMakeLists.txt b/tools/swift-def-to-strings-converter/CMakeLists.txt
index 2bfd9145a5a30..fa81fe6ae60bc 100644
--- a/tools/swift-def-to-strings-converter/CMakeLists.txt
+++ b/tools/swift-def-to-strings-converter/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_swift_host_tool(swift-def-to-strings-converter
   swift-def-to-strings-converter.cpp
   SWIFT_COMPONENT tools
+  DOES_NOT_USE_SWIFT
 )
 
 target_link_libraries(swift-def-to-strings-converter PRIVATE
diff --git a/tools/swift-serialize-diagnostics/CMakeLists.txt b/tools/swift-serialize-diagnostics/CMakeLists.txt
index 4a1ab49b59ed3..aee14abd2dd32 100644
--- a/tools/swift-serialize-diagnostics/CMakeLists.txt
+++ b/tools/swift-serialize-diagnostics/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_swift_host_tool(swift-serialize-diagnostics
   swift-serialize-diagnostics.cpp
   SWIFT_COMPONENT tools
+  DOES_NOT_USE_SWIFT
 )
 target_link_libraries(swift-serialize-diagnostics PRIVATE
   swiftLocalization)

From f64506976aac4e611641415fb1c43e7f4e632d3e Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Tue, 29 Aug 2023 01:06:51 +0000
Subject: [PATCH 11/12] [CMake] Use RPATH_CHANGE instead RPATH_SET

RPATH_SET is not available until cmake 3.21.0. Use RPATH_CHANGE instead.
---
 cmake/modules/SetRPATH.cmake | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/SetRPATH.cmake b/cmake/modules/SetRPATH.cmake
index f843e5df40bb3..76b8b4644e59a 100644
--- a/cmake/modules/SetRPATH.cmake
+++ b/cmake/modules/SetRPATH.cmake
@@ -4,10 +4,18 @@ function(swift_get_set_rpath_script_file out_var)
   set(${out_var} "${SWIFT_SET_RPATH_SCRIPT_FILE}" PARENT_SCOPE)
 endfunction()
 
-# Actual RPATH_SET operation to the file.
+# Actual RPATH_CHANGE operation to the file.
 function(_swift_set_rpath_impl file new_rpath)
-  # NOTE: RPATH_SET is not documented, and works only for ELF and XCOFF. 
-  file(RPATH_SET FILE "${file}" NEW_RPATH "${new_rpath}")
+  # FIXME: Handle non-ELF files. We can't use RPATH_SET because it's only available CMake 3.21.0
+  execute_process(
+    COMMAND readelf -Wd "${file}"
+    COMMAND grep -Po "R(UN)?PATH.*\\[\\K[^\\]]*"
+    OUTPUT_VARIABLE current_rpath
+  )
+  string(STRIP "${current_rpath}" current_rpath)
+
+  # NOTE: RPATH_CHANGE is not documented, and works only for ELF and XCOFF.
+  file(RPATH_CHANGE FILE "${file}" OLD_RPATH "${current_rpath}" NEW_RPATH "${new_rpath}")
 endfunction()
 
 # For 'cmake -P <scirpt>'.

From 0aa0aac72e923b53801b32bb09fc1149185a256f Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Tue, 29 Aug 2023 16:36:24 +0000
Subject: [PATCH 12/12] [CMake] Always use builder's runtime for building Swift
 code in Linux

Some non-stdlib thing e.g. swift-backtrace still might be built before
the runtime is built. For building Swift code in Linux "hosttools",
always set 'LD_LIBRARY_PATH' to the runtime in the builder.
---
 stdlib/cmake/modules/SwiftSource.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake
index e7a82ad985683..5f688241741f9 100644
--- a/stdlib/cmake/modules/SwiftSource.cmake
+++ b/stdlib/cmake/modules/SwiftSource.cmake
@@ -801,7 +801,10 @@ function(_compile_swift_files
     set(swift_compiler_tool "${SWIFT_SOURCE_DIR}/utils/check-incremental" "${swift_compiler_tool}")
   endif()
 
-  if(SWIFTFILE_IS_STDLIB)
+  if(SWIFTFILE_IS_STDLIB OR
+     # Linux "hosttools" build require builder's runtime before building the runtime.
+     (BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
+  )
     get_bootstrapping_swift_lib_dir(bs_lib_dir "${SWIFTFILE_BOOTSTRAPPING}")
     if(bs_lib_dir)
       # When building the stdlib with bootstrapping, the compiler needs