Fix typo, rework how OSX_SYSROOT is used by llvm

Author: edymtt

utils/build_swift/build_swift/driver_arguments.py

@@ -1399,7 +1399,7 @@ def create_argument_parser():
                 'be called multiple times to add multiple such options.')
 
     option('--llvm-build-compiler-rt-with-use-runtimes', toggle_true,
-           help='Switch to LLVM_USE_RUNTIMES as the mechanism to build compiler-rt'
+           help='Switch to LLVM_ENABLE_RUNTIMES as the mechanism to build compiler-rt'
                 'It will become the default with LLVM 21, this flag is '
                 'meant to stage its introduction and account for edge cases')
 

utils/swift_build_support/swift_build_support/products/cmake_product.py

@@ -23,10 +23,6 @@ class CMakeProduct(product.Product):
     def is_verbose(self):
         return self.args.verbose_build
 
-    @property
-    def cmake_os_sysroot(self):
-        return self._cmake_os_sysroot
-
     def build_with_cmake(self, build_targets, build_type, build_args,
                          prefer_native_toolchain=False):
         assert self.toolchain.cmake is not None
@@ -347,11 +343,11 @@ def host_cmake_options(self, host_target):
                     option_name = 'SWIFTLIB_DEPLOYMENT_VERSION_{}'.format(sdk_target)
                     swift_cmake_options.define(option_name, target_version)
 
-            self._cmake_os_sysroot = xcrun.sdk_path(sdk=platform)
+            cmake_os_sysroot = xcrun.sdk_path(sdk=platform)
 
             llvm_cmake_options.define('CMAKE_OSX_DEPLOYMENT_TARGET:STRING',
                                       cmake_osx_deployment_target)
-            llvm_cmake_options.define('CMAKE_OSX_SYSROOT:PATH', self.cmake_os_sysroot)
+            llvm_cmake_options.define('CMAKE_OSX_SYSROOT:PATH', cmake_os_sysroot)
             llvm_cmake_options.define('COMPILER_RT_ENABLE_IOS:BOOL', 'FALSE')
             llvm_cmake_options.define('COMPILER_RT_ENABLE_WATCHOS:BOOL', 'FALSE')
             llvm_cmake_options.define('COMPILER_RT_ENABLE_TVOS:BOOL', 'FALSE')
@@ -380,7 +376,7 @@ def host_cmake_options(self, host_target):
                                        self.args.darwin_deployment_version_tvos)
             swift_cmake_options.define('SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS',
                                        self.args.darwin_deployment_version_watchos)
-            swift_cmake_options.define('CMAKE_OSX_SYSROOT:PATH', self.cmake_os_sysroot)
+            swift_cmake_options.define('CMAKE_OSX_SYSROOT:PATH', cmake_os_sysroot)
             # This is needed to make sure to avoid using the wrong architecture
             # in the compiler checks CMake performs
             swift_cmake_options.define('CMAKE_OSX_ARCHITECTURES', arch)
@@ -419,4 +415,8 @@ def host_cmake_options(self, host_target):
 
         llvm_cmake_options.define('COVERAGE_DB', self.args.coverage_db)
 
-        return (llvm_cmake_options, swift_cmake_options)
+        # This provides easier access to certain settings
+        # users may need without having to use CMakeOptions interface
+        relevant_options = {'CMAKE_OSX_SYSROOT': cmake_os_sysroot}
+
+        return (llvm_cmake_options, swift_cmake_options, relevant_options)

utils/swift_build_support/swift_build_support/products/llvm.py

@@ -225,7 +225,7 @@ def build(self, host_target):
 
         (platform, arch) = host_target.split('-')
 
-        llvm_cmake_options = self.host_cmake_options(host_target)[0]
+        llvm_cmake_options, _, relevant_options = self.host_cmake_options(host_target)
         llvm_cmake_options.extend_raw(self.args.llvm_cmake_options)
 
         # TODO: handle cross compilation
@@ -307,13 +307,13 @@ def build(self, host_target):
         builtins_runtimes_target_for_darwin = 'arm64-apple-darwin'
         if system() == "Darwin":
             llvm_cmake_options.define(
-                f'RUNTIMES_{builtins_runtimes_target_for_darwin}_'
+                f'BUILTINS_{builtins_runtimes_target_for_darwin}_'
                 'CMAKE_OSX_SYSROOT',
-                self.cmake_os_sysroot)
+                relevant_options['CMAKE_OSX_SYSROOT'])
             llvm_cmake_options.define(
-                f'BUILTINS_{builtins_runtimes_target_for_darwin}_'
+                f'RUNTIMES_{builtins_runtimes_target_for_darwin}_'
                 'CMAKE_OSX_SYSROOT',
-                self.cmake_os_sysroot)
+                relevant_options['CMAKE_OSX_SYSROOT'])
             llvm_cmake_options.define(
                 'LLVM_BUILTIN_TARGETS', builtins_runtimes_target_for_darwin)
             llvm_cmake_options.define(

validation-test/BuildSystem/llvm-build-compiler-rt-on-macosx.test

@@ -8,6 +8,8 @@
 
 # LLVM-USE-RUNTIMES: Building llvm
 # LLVM-USE-RUNTIMES-DAG: cmake -G Ninja
+# LLVM-USE-RUNTIMES-SAME: -DBUILTINS_{{[^ ]*}}_CMAKE_OSX_SYSROOT
+# LLVM-USE-RUNTIMES-SAME: -DRUNTIMES_{{[^ ]*}}_CMAKE_OSX_SYSROOT
 # LLVM-USE-RUNTIMES-SAME: -DLLVM_BUILTIN_TARGETS
 # LLVM-USE-RUNTIMES-SAME: -DLLVM_RUNTIME_TARGETS
 # LLVM-USE-RUNTIMES-SAME: -DRUNTIMES_{{[^ ]*}}_COMPILER_RT_SANITIZERS_TO_BUILD