diff options
| -rw-r--r-- | llvm/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | llvm/include/llvm/Config/abi-breaking.h.cmake | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 68caedbf9de..3937aa01352 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -396,9 +396,6 @@ option(LLVM_ENABLE_EXPENSIVE_CHECKS "Enable expensive checks" OFF) set(LLVM_ABI_BREAKING_CHECKS "WITH_ASSERTS" CACHE STRING "Enable abi-breaking checks. Can be WITH_ASSERTS, FORCE_ON or FORCE_OFF.") -option(LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING - "Disable abi-breaking checks mismatch detection at link-tim." OFF) - option(LLVM_FORCE_USE_OLD_HOST_TOOLCHAIN "Set to ON to force using an old, unsupported host toolchain." OFF) diff --git a/llvm/include/llvm/Config/abi-breaking.h.cmake b/llvm/include/llvm/Config/abi-breaking.h.cmake index 9c3bfb48953..4ce487b8f5f 100644 --- a/llvm/include/llvm/Config/abi-breaking.h.cmake +++ b/llvm/include/llvm/Config/abi-breaking.h.cmake @@ -15,11 +15,8 @@ /* Define to enable checks that alter the LLVM C++ ABI */ #cmakedefine01 LLVM_ENABLE_ABI_BREAKING_CHECKS -/* Define to disable the link-time checking of mismatch for - LLVM_ENABLE_ABI_BREAKING_CHECKS */ -#ifndef LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING -#cmakedefine01 LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING -#endif +/* Allow selectively disabling link-time mismatch checking so that header-only + ADT content from LLVM can be used without linking libSupport. */ #if !LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING // ABI_BREAKING_CHECKS protection: provides link-time failure when clients build |
