build: Respect native-*-tools-path when building Wasm stdlib

This change allows the Wasm stdlib to be built using the prebuilt Swift
toolchain instead of just built from source.

Author: kateinoigakukun

utils/swift_build_support/swift_build_support/cmake.py

@@ -147,7 +147,7 @@ def common_options(self, product=None):
             define("CMAKE_CXX_COMPILER_LAUNCHER:PATH", args.cmake_cxx_launcher)
 
         if self.prefer_just_built_toolchain and product:
-            toolchain_path = product.install_toolchain_path(args.host_target)
+            toolchain_path = product.native_toolchain_path(args.host_target)
             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
                                           os.path.join(toolchain_path, 'bin', 'swiftc'))
             define("CMAKE_C_COMPILER:PATH", os.path.join(toolchain_path,

utils/swift_build_support/swift_build_support/products/wasisysroot.py

@@ -45,7 +45,10 @@ def should_install(self, host_target):
 
     def build(self, host_target):
         build_root = os.path.dirname(self.build_dir)
-        llvm_build_dir = os.path.join('..', build_root, '%s-%s' % ('llvm', host_target))
+        llvm_build_bin_dir = os.path.join(
+            '..', build_root, '%s-%s' % ('llvm', host_target), 'bin')
+        llvm_tools_path = self.args.native_llvm_tools_path or llvm_build_bin_dir
+        clang_tools_path = self.args.native_clang_tools_path or llvm_build_bin_dir
         build_jobs = self.args.build_jobs or multiprocessing.cpu_count()
 
         sysroot_build_dir = WASILibc.sysroot_build_path(build_root, host_target)
@@ -66,9 +69,9 @@ def build(self, host_target):
             'OBJDIR=' + os.path.join(self.build_dir, 'obj'),
             'SYSROOT=' + sysroot_build_dir,
             'INSTALL_DIR=' + WASILibc.sysroot_install_path(build_root),
-            'CC=' + os.path.join(llvm_build_dir, 'bin', 'clang'),
-            'AR=' + os.path.join(llvm_build_dir, 'bin', 'llvm-ar'),
-            'NM=' + os.path.join(llvm_build_dir, 'bin', 'llvm-nm'),
+            'CC=' + os.path.join(clang_tools_path, 'clang'),
+            'AR=' + os.path.join(llvm_tools_path, 'llvm-ar'),
+            'NM=' + os.path.join(llvm_tools_path, 'llvm-nm'),
         ])
 
     @classmethod
@@ -119,7 +122,10 @@ def should_install(self, host_target):
 
     def build(self, host_target):
         build_root = os.path.dirname(self.build_dir)
-        llvm_build_dir = os.path.join('..', build_root, '%s-%s' % ('llvm', host_target))
+        llvm_build_bin_dir = os.path.join(
+            '..', build_root, '%s-%s' % ('llvm', host_target), 'bin')
+        llvm_tools_path = self.args.native_llvm_tools_path or llvm_build_bin_dir
+        clang_tools_path = self.args.native_clang_tools_path or llvm_build_bin_dir
 
         self.cmake_options.define('CMAKE_SYSROOT:PATH',
                                   WASILibc.sysroot_build_path(build_root, host_target))
@@ -144,13 +150,13 @@ def build(self, host_target):
         self.cmake_options.define('CMAKE_SYSTEM_NAME:STRING', 'WASI')
         self.cmake_options.define('CMAKE_SYSTEM_PROCESSOR:STRING', 'wasm32')
         self.cmake_options.define('CMAKE_AR:FILEPATH',
-                                  os.path.join(llvm_build_dir, 'bin', 'llvm-ar'))
+                                  os.path.join(llvm_tools_path, 'llvm-ar'))
         self.cmake_options.define('CMAKE_RANLIB:FILEPATH',
-                                  os.path.join(llvm_build_dir, 'bin', 'llvm-ranlib'))
+                                  os.path.join(llvm_tools_path, 'llvm-ranlib'))
         self.cmake_options.define('CMAKE_C_COMPILER:FILEPATH',
-                                  os.path.join(llvm_build_dir, 'bin', 'clang'))
+                                  os.path.join(clang_tools_path, 'clang'))
         self.cmake_options.define('CMAKE_CXX_COMPILER:STRING',
-                                  os.path.join(llvm_build_dir, 'bin', 'clang++'))
+                                  os.path.join(clang_tools_path, 'clang++'))
         # Explicitly disable exceptions even though it's usually implicitly disabled by
         # LIBCXX_ENABLE_EXCEPTIONS because the CMake feature check fails to detect
         # -fno-exceptions support in clang due to missing compiler-rt while configuring

utils/swift_build_support/swift_build_support/products/wasmstdlib.py

@@ -44,7 +44,7 @@ def build(self, host_target):
             'SWIFT_STDLIB_BUILD_TYPE:STRING', self._build_variant)
 
         # Toolchain configuration
-        toolchain_path = self.install_toolchain_path(host_target)
+        toolchain_path = self.native_toolchain_path(host_target)
         # Explicitly set the CMake AR and RANLIB to force it to use llvm-ar/llvm-ranlib
         # instead of the system ar/ranlib, which usually don't support WebAssembly
         # object files.