[build-toolchain] don't copy swift tools from host build dir to avoid rpath issue

swift-frontend now links libswiftCore placed at relative to the
executable (@executable_path/../lib/swift/macosx), so copying the
executable to the target build dir doesn't work.

This patch changes to use SWIFT_NATIVE_*_TOOLS_PATH via ninja
check-swift task instead of run-test.

Author: kateinoigakukun

.github/workflows/build-toolchain.yml

@@ -148,10 +148,7 @@ jobs:
         if: ${{ matrix.run_stdlib_test }}
         run: |
           TARGET_STDLIB_BUILD_DIR=${{ github.workspace }}/target-build/swift-stdlib-wasi-wasm32
-          ./swift/utils/run-test --build-dir "$TARGET_STDLIB_BUILD_DIR" --target wasi-wasm32 \
-            "$TARGET_STDLIB_BUILD_DIR/test-wasi-wasm32/stdlib"
-          ./swift/utils/run-test --build-dir "$TARGET_STDLIB_BUILD_DIR" --target wasi-wasm32 \
-            "$TARGET_STDLIB_BUILD_DIR/test-wasi-wasm32/Concurrency/Runtime"
+          ninja check-swift-wasi-wasm32-custom -C "$TARGET_STDLIB_BUILD_DIR"
 
       - name: Run all tests for wasi-wasm32
         if: ${{ matrix.run_full_test }}

test/CMakeLists.txt

@@ -154,8 +154,14 @@ if(NOT SWIFT_INCLUDE_TOOLS)
       )
   endif()
   if(SWIFT_BUILD_STDLIB)
-    list(APPEND SWIFT_LIT_ARGS
-         "--param" "test_resource_dir=${SWIFTLIB_DIR}")
+    # if building only static stdlib, prefer static lib.
+    if(NOT SWIFT_BUILD_DYNAMIC_STDLIB AND SWIFT_BUILD_STATIC_STDLIB)
+      list(APPEND SWIFT_LIT_ARGS
+           "--param" "test_resource_dir=${SWIFTSTATICLIB_DIR}")
+    else()
+      list(APPEND SWIFT_LIT_ARGS
+           "--param" "test_resource_dir=${SWIFTLIB_DIR}")
+    endif()
   endif()
 endif()
 

utils/webassembly/build-toolchain.sh

@@ -111,6 +111,8 @@ build_target_toolchain() {
   # Set WASI as a UNIX platform to spoof LLVM
   # FIXME(katei): host-build clang's libcxx is capable with LLVM, but it somehow
   # fails libcxx version check. So activate LLVM_COMPILER_CHECKED to spoof the checker
+  # SWIFT_DRIVER_TEST_OPTIONS is used to specify clang resource dir for wasm32-unknown-wasi
+  # because it's not built beside clang
   cmake -B "$SWIFT_STDLIB_BUILD_DIR" \
     -C "$SOURCE_PATH/swift/cmake/caches/Runtime-WASI-wasm32.cmake" \
     -D CMAKE_TOOLCHAIN_FILE="$SOURCE_PATH/swift/utils/webassembly/toolchain-wasi.cmake" \
@@ -123,6 +125,10 @@ build_target_toolchain() {
     -D LLVM_COMPILER_CHECKED=YES \
     -D UNIX=1 \
     -D SWIFT_NATIVE_SWIFT_TOOLS_PATH="$HOST_BUILD_DIR/swift-$HOST_SUFFIX/bin" \
+    -D SWIFT_NATIVE_CLANG_TOOLS_PATH="$HOST_BUILD_DIR/llvm-$HOST_SUFFIX/bin" \
+    -D SWIFT_NATIVE_LLVM_TOOLS_PATH="$HOST_BUILD_DIR/llvm-$HOST_SUFFIX/bin" \
+    -D SWIFT_LIT_TEST_PATHS="$SWIFT_STDLIB_BUILD_DIR/test-wasi-wasm32/stdlib;$SWIFT_STDLIB_BUILD_DIR/test-wasi-wasm32/Concurrency/Runtime" \
+    -D SWIFT_DRIVER_TEST_OPTIONS=" -Xclang-linker -resource-dir -Xclang-linker $COMPILER_RT_BUILD_DIR" \
     -D SWIFT_WASI_SYSROOT_PATH="$WASI_SYSROOT_PATH" \
     -D SWIFT_WASI_wasm32_ICU_UC_INCLUDE="$BUILD_SDK_PATH/icu/include" \
     -D SWIFT_WASI_wasm32_ICU_UC="$BUILD_SDK_PATH/icu/lib/libicuuc.a" \
@@ -134,10 +140,6 @@ build_target_toolchain() {
 
   ninja install -C "$SWIFT_STDLIB_BUILD_DIR"
 
-  # Copy tool binaries in target build dir to test stdlib
-  rsync -a "$HOST_BUILD_DIR/llvm-$HOST_SUFFIX/bin/" "$SWIFT_STDLIB_BUILD_DIR/bin/"
-  rsync -a "$HOST_BUILD_DIR/swift-$HOST_SUFFIX/bin/" "$SWIFT_STDLIB_BUILD_DIR/bin/"
-
   # Link compiler-rt libs to stdlib build dir
   mkdir -p "$SWIFT_STDLIB_BUILD_DIR/lib/clang/10.0.0/"
   ln -fs "$COMPILER_RT_BUILD_DIR/lib" "$SWIFT_STDLIB_BUILD_DIR/lib/clang/10.0.0/lib"