Merge pull request #62162 from drexin/wip-102476062

[Build] Use llvm-cmake-flags in llvm build-script product

Author: drexin

utils/build_swift/build_swift/driver_arguments.py

@@ -1250,6 +1250,12 @@ def create_argument_parser():
     option('--no-llvm-include-tests', toggle_false('llvm_include_tests'),
            help='do not generate testing targets for LLVM')
 
+    option('--llvm-cmake-options', append,
+           type=argparse.ShellSplitType(),
+           help='CMake options used for llvm in the form of comma '
+                'separated options "-DCMAKE_VAR1=YES,-DCMAKE_VAR2=/tmp". Can '
+                'be called multiple times to add multiple such options.')
+
     # -------------------------------------------------------------------------
     in_group('Build settings for Android')
 

utils/build_swift/tests/expected_options.py

@@ -201,6 +201,7 @@
     'lldb_build_with_xcode': '0',
     'llvm_assertions': True,
     'llvm_build_variant': 'Debug',
+    'llvm_cmake_options': [],
     'llvm_enable_modules': False,
     'llvm_include_tests': True,
     'llvm_ninja_targets': [],
@@ -758,6 +759,7 @@ class BuildScriptImplOption(_BaseOption):
     AppendOption('--test-paths'),
     AppendOption('--llvm-ninja-targets'),
     AppendOption('--llvm-ninja-targets-for-cross-compile-hosts'),
+    AppendOption('--llvm-cmake-options'),
     AppendOption('--darwin-symroot-path-filters'),
 
     UnsupportedOption('--build-jobs'),

utils/swift_build_support/swift_build_support/cmake.py

@@ -61,6 +61,9 @@ def extend(self, tuples_or_options):
             for (variable, value) in tuples_or_options:
                 self.define(variable, value)
 
+    def extend_raw(self, option_strings):
+        self._options.extend(option_strings)
+
     @staticmethod
     def true_false(value):
         if hasattr(value, 'lower'):

utils/swift_build_support/swift_build_support/products/llvm.py

@@ -202,6 +202,7 @@ def build(self, host_target):
         (platform, arch) = host_target.split('-')
 
         llvm_cmake_options = self.host_cmake_options(host_target)[0]
+        llvm_cmake_options.extend_raw(self.args.llvm_cmake_options)
 
         # TODO: handle cross compilation
         llvm_cmake_options.define('CMAKE_INSTALL_PREFIX:PATH', self.args.install_prefix)