Skip to content

Commit f6d15f9

Browse files
authored
LLVM_REQUIRES_* variables shound't be set (#4850)
The `LLVM_REQUIRES_*` variables are internal variables in LLVM's configuration used to determine if a build setting is required, they don't actually control the build setting itself, so we shouldn't be setting them. `LLVM_ENABLE_*` variables control the build settings, and we do set those correctly.
1 parent 4271f47 commit f6d15f9

2 files changed

Lines changed: 0 additions & 4 deletions

File tree

cmake/caches/PredefinedParams.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ set(LLVM_ENABLE_RTTI ON CACHE BOOL "")
2929
set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "")
3030
set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "")
3131
set(LLVM_OPTIMIZED_TABLEGEN OFF CACHE BOOL "")
32-
set(LLVM_REQUIRES_EH ON CACHE BOOL "")
33-
set(LLVM_REQUIRES_RTTI ON CACHE BOOL "")
3432
set(LLVM_TARGETS_TO_BUILD "None" CACHE STRING "")
3533
set(LIBCLANG_BUILD_STATIC ON CACHE BOOL "")
3634
set(CLANG_BUILD_EXAMPLES OFF CACHE BOOL "")

utils/hct/hctbuild.cmd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_INCLUDE_DOCS:BOOL=OFF -DLLVM_INCLUDE_EXAMPLES
308308
set CMAKE_OPTS=%CMAKE_OPTS% -DLIBCLANG_BUILD_STATIC:BOOL=ON
309309
rem set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_OPTIMIZED_TABLEGEN:BOOL=ON
310310
set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_OPTIMIZED_TABLEGEN:BOOL=OFF
311-
set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_REQUIRES_EH:BOOL=ON
312311
set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_APPEND_VC_REV:BOOL=ON
313312

314313
rem Enable exception handling (which requires RTTI).
@@ -319,7 +318,6 @@ rem Setup a specific, stable triple for HLSL.
319318
set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=dxil-ms-dx
320319

321320
set CMAKE_OPTS=%CMAKE_OPTS% -DCLANG_BUILD_EXAMPLES:BOOL=OFF
322-
set CMAKE_OPTS=%CMAKE_OPTS% -DLLVM_REQUIRES_RTTI:BOOL=ON
323321
set CMAKE_OPTS=%CMAKE_OPTS% -DCLANG_CL:BOOL=OFF
324322
set CMAKE_OPTS=%CMAKE_OPTS% -DCMAKE_SYSTEM_VERSION=%DXC_CMAKE_SYSTEM_VERSION%
325323

0 commit comments

Comments
 (0)