Skip to content

Commit 56b7137

Browse files
committed
Use LLVM_USE_RUNTIMES to build compiler-rt by default
Addresses rdar://113972453
1 parent 442edf4 commit 56b7137

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ def create_argument_parser():
13981398
'separated options "-DCMAKE_VAR1=YES,-DCMAKE_VAR2=/tmp". Can '
13991399
'be called multiple times to add multiple such options.')
14001400

1401-
option('--llvm-build-compiler-rt-with-use-runtimes', toggle_true,
1401+
option('--llvm-build-compiler-rt-with-use-runtimes', toggle_false,
14021402
help='Switch to LLVM_USE_RUNTIMES as the mechanism to build compiler-rt'
14031403
'It will become the default with LLVM 21, this flag is '
14041404
'meant to stage its introduction and account for edge cases')

utils/build_swift/tests/expected_options.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
'lldb_build_variant': 'Debug',
233233
'lldb_build_with_xcode': '0',
234234
'llvm_assertions': True,
235-
'llvm_build_compiler_rt_with_use_runtimes': False,
235+
'llvm_build_compiler_rt_with_use_runtimes': True,
236236
'llvm_build_variant': 'Debug',
237237
'llvm_cmake_options': [],
238238
'llvm_enable_modules': False,
@@ -854,7 +854,7 @@ class BuildScriptImplOption(_BaseOption):
854854
AppendOption('--llvm-ninja-targets'),
855855
AppendOption('--llvm-ninja-targets-for-cross-compile-hosts'),
856856
AppendOption('--llvm-cmake-options'),
857-
SetTrueOption('--llvm-build-compiler-rt-with-use-runtimes'),
857+
SetFalseOption('--llvm-build-compiler-rt-with-use-runtimes'),
858858
AppendOption('--darwin-symroot-path-filters'),
859859

860860
UnsupportedOption('--build-jobs'),

0 commit comments

Comments
 (0)