[WASM] Rename TOOLS_BIN_DIR to LLVM_BIN_DIR

Author: kateinoigakukun

utils/webassembly/build-presets.ini

@@ -84,8 +84,8 @@ extra-cmake-options=
     -DSWIFT_BUILD_SOURCEKIT=FALSE
     -DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
     -DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
-    -DCMAKE_AR="%(TOOLS_BIN_DIR)s/llvm-ar"
-    -DCMAKE_RANLIB="%(TOOLS_BIN_DIR)s/llvm-ranlib"
+    -DCMAKE_AR="%(LLVM_BIN_DIR)s/llvm-ar"
+    -DCMAKE_RANLIB="%(LLVM_BIN_DIR)s/llvm-ranlib"
     -DCLANG_COMPILER_RT_CMAKE_ARGS='-DCMAKE_TOOLCHAIN_FILE=%(SOURCE_PATH)s/swift/utils/webassembly/compiler-rt-cache.cmake'
     -DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE
 
@@ -103,7 +103,7 @@ extra-cmake-options=
     -DSWIFT_BUILD_SOURCEKIT=FALSE
     -DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
     -DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
-    -DCMAKE_AR='%(TOOLS_BIN_DIR)s/llvm-ar'
-    -DCMAKE_RANLIB='%(TOOLS_BIN_DIR)s/llvm-ranlib'
+    -DCMAKE_AR='%(LLVM_BIN_DIR)s/llvm-ar'
+    -DCMAKE_RANLIB='%(LLVM_BIN_DIR)s/llvm-ranlib'
     -DCLANG_COMPILER_RT_CMAKE_ARGS='-DCMAKE_TOOLCHAIN_FILE=%(SOURCE_PATH)s/swift/utils/webassembly/compiler-rt-cache.cmake'
     -DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE

utils/webassembly/build-toolchain.sh

@@ -95,7 +95,7 @@ build_target_toolchain() {
     DISPLAY_NAME_SHORT="${DISPLAY_NAME_SHORT}" \
     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}" \
     TOOLCHAIN_VERSION="${TOOLCHAIN_VERSION}" \
-    TOOLS_BIN_DIR="${HOST_TOOLCHAIN_SDK}/usr/bin" \
+    LLVM_BIN_DIR="${HOST_TOOLCHAIN_SDK}/usr/bin" \
     C_CXX_LAUNCHER="$(which sccache)"
 
   "$UTILS_PATH/build-foundation.sh" "$TARGET_TOOLCHAIN_SDK"