[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.

Author: rintaro

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()

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()
 

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()

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()

cmake/modules/SwiftStripBuilderRpath.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()

cmake/modules/SwiftUtils.cmake

@@ -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()
 

lib/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

tools/driver/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")

tools/swift-compatibility-symbols/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

tools/swift-def-to-strings-converter/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)