Skip to content

Commit ff62919

Browse files
committed
build: LLVM runtimes come from presets
1 parent 73fadd7 commit ff62919

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ jobs:
262262
preset: ${{ matrix.llvm-build-preset }}
263263
build-type: ${{ matrix.build-type }}
264264
extra-args: |
265-
${{ runner.os == 'Windows' && '-DLLVM_ENABLE_RUNTIMES=libcxx' || '-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi;libunwind' }}
266265
-DLLVM_USE_SANITIZER=${{ matrix.llvm-sanitizer-config }}
267266
cc: ${{ steps.setup-cpp.outputs.cc }}
268267
cxx: ${{ steps.setup-cpp.outputs.cxx }}

bootstrap.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,6 @@ def install_llvm(self):
690690
self.prompt_dependency_path_option("llvm_install_dir")
691691
cmake_preset = f"{self.options.llvm_build_type.lower()}-win" if self.is_windows() else f"{self.options.llvm_build_type.lower()}-unix"
692692
cmake_extra_args = [f"--preset={cmake_preset}"]
693-
if self.is_windows():
694-
cmake_extra_args.append("-DLLVM_ENABLE_RUNTIMES=libcxx")
695-
else:
696-
cmake_extra_args.append("-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi;libunwind")
697693
self.cmake_workflow(llvm_subproject_dir, self.options.llvm_build_type, self.options.llvm_build_dir,
698694
self.options.llvm_install_dir, cmake_extra_args)
699695

third-party/llvm/CMakePresets.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
"CMAKE_C_FLAGS_MINSIZEREL": "/MD /O1 /Ob1 /DNDEBUG",
100100
"CMAKE_CXX_FLAGS_MINSIZEREL": "/MD /O1 /Ob1 /DNDEBUG",
101101
"CMAKE_C_FLAGS_RELWITHDEBINFO": "/MD /Zi /O2 /Ob1",
102-
"CMAKE_CXX_FLAGS_RELWITHDEBINFO": "/MD /Zi /O2 /Ob1"
102+
"CMAKE_CXX_FLAGS_RELWITHDEBINFO": "/MD /Zi /O2 /Ob1",
103+
"LLVM_ENABLE_RUNTIMES": "libcxx"
103104
}
104105
},
105106
{
@@ -145,7 +146,8 @@
145146
"displayName": "Debug-Base-Unix",
146147
"description": "Debug Config without any extras and windows flags",
147148
"cacheVariables": {
148-
"CMAKE_BUILD_TYPE": "Debug"
149+
"CMAKE_BUILD_TYPE": "Debug",
150+
"LLVM_ENABLE_RUNTIMES": "libcxx;libcxxabi;libunwind"
149151
}
150152
},
151153
{

0 commit comments

Comments
 (0)