build: Rename prefer_just_built_toolchain -> prefer_native_toolchain

Author: kateinoigakukun

utils/swift_build_support/swift_build_support/cmake.py

@@ -97,13 +97,16 @@ def __iadd__(self, other):
 
 class CMake(object):
 
-    def __init__(self, args, toolchain, prefer_just_built_toolchain=False):
-        """If prefer_just_built_toolchain is set to True, we set the clang, clang++,
-        and Swift compilers from the installed toolchain.
+    def __init__(self, args, toolchain, prefer_native_toolchain=False):
+        """If prefer_native_toolchain is set to True, we set the clang, clang++,
+        and Swift compilers from the toolchain explicitly specified by the
+        native-*-tools-path options or just installed toolchain if the options
+        are not specified. If prefer_native_toolchain is set to False, we use
+        system defaults.
         """
         self.args = args
         self.toolchain = toolchain
-        self.prefer_just_built_toolchain = prefer_just_built_toolchain
+        self.prefer_native_toolchain = prefer_native_toolchain
 
     def common_options(self, product=None):
         """Return options used for all products, including LLVM/Clang
@@ -146,7 +149,7 @@ def common_options(self, product=None):
         if args.cmake_cxx_launcher:
             define("CMAKE_CXX_COMPILER_LAUNCHER:PATH", args.cmake_cxx_launcher)
 
-        if self.prefer_just_built_toolchain and product:
+        if self.prefer_native_toolchain and product:
             toolchain_path = product.native_toolchain_path(args.host_target)
             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
                                           os.path.join(toolchain_path, 'bin', 'swiftc'))

utils/swift_build_support/swift_build_support/products/cmake_product.py

@@ -24,11 +24,11 @@ def is_verbose(self):
         return self.args.verbose_build
 
     def build_with_cmake(self, build_targets, build_type, build_args,
-                         prefer_just_built_toolchain=False):
+                         prefer_native_toolchain=False):
         assert self.toolchain.cmake is not None
         cmake_build = []
         _cmake = cmake.CMake(self.args, self.toolchain,
-                             prefer_just_built_toolchain)
+                             prefer_native_toolchain)
 
         if self.toolchain.distcc_pump:
             cmake_build.append(self.toolchain.distcc_pump)

utils/swift_build_support/swift_build_support/products/minimalstdlib.py

@@ -174,7 +174,7 @@ def build(self, host_target):
 
         # Build!
         self.build_with_cmake(["swift-stdlib-freestanding"], build_variant, [],
-                              prefer_just_built_toolchain=True)
+                              prefer_native_toolchain=True)
 
     def should_test(self, host_target):
         return False

utils/swift_build_support/swift_build_support/products/wasisysroot.py

@@ -194,7 +194,7 @@ def build(self, host_target):
         self.cmake_options.define('UNIX:BOOL', 'TRUE')
 
         self.build_with_cmake([], self.args.build_variant, [],
-                              prefer_just_built_toolchain=True)
+                              prefer_native_toolchain=True)
         self.install_with_cmake(
             ["install"], WASILibc.sysroot_install_path(build_root))
 

utils/swift_build_support/swift_build_support/products/wasmstdlib.py

@@ -117,7 +117,7 @@ def build(self, host_target):
 
         # Configure with WebAssembly target variant, and build with just-built toolchain
         self.build_with_cmake([], self._build_variant, [],
-                              prefer_just_built_toolchain=True)
+                              prefer_native_toolchain=True)
 
     def test(self, host_target):
         build_root = os.path.dirname(self.build_dir)