Skip to content

Commit 7aa3dbc

Browse files
authored
Revert "Remember LLVM_ENABLE_LIBCXX setting in installed configuration (#139712)"
This reverts commit b010b7e.
1 parent df0e9f3 commit 7aa3dbc

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

llvm/cmake/modules/HandleLLVMStdlib.cmake

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# if the user has requested it.
33

44
include(DetermineGCCCompatible)
5-
include(CheckIncludeFiles)
65

76
if(NOT DEFINED LLVM_STDLIB_HANDLED)
87
set(LLVM_STDLIB_HANDLED ON)
@@ -20,17 +19,7 @@ if(NOT DEFINED LLVM_STDLIB_HANDLED)
2019
if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
2120
check_cxx_compiler_flag("-stdlib=libc++" CXX_COMPILER_SUPPORTS_STDLIB)
2221
check_linker_flag(CXX "-stdlib=libc++" CXX_LINKER_SUPPORTS_STDLIB)
23-
24-
# Check whether C++ include files are available
25-
# runtimes/CMakeLists.txt adds -nostdlib++ and -nostdinc++ to
26-
# CMAKE_REQUIRED_FLAGS, which are incompatible with -stdlib=libc++; use
27-
# a fresh CMAKE_REQUIRED_FLAGS environment.
28-
cmake_push_check_state(RESET)
29-
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -stdlib=libc++")
30-
check_include_files("chrono" CXX_COMPILER_SUPPORTS_STDLIB_CHRONO LANGUAGE CXX)
31-
cmake_pop_check_state()
32-
33-
if(CXX_COMPILER_SUPPORTS_STDLIB AND CXX_LINKER_SUPPORTS_STDLIB AND CXX_COMPILER_SUPPORTS_STDLIB_CHRONO)
22+
if(CXX_COMPILER_SUPPORTS_STDLIB AND CXX_LINKER_SUPPORTS_STDLIB)
3423
append("-stdlib=libc++"
3524
CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS
3625
CMAKE_MODULE_LINKER_FLAGS)

llvm/cmake/modules/LLVMConfig.cmake.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ endif()
5555

5656
set(LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@)
5757

58-
set(LLVM_ENABLE_LIBCXX @LLVM_ENABLE_LIBCXX@)
59-
6058
set(LLVM_ENABLE_LIBEDIT @HAVE_LIBEDIT@)
6159
if(LLVM_ENABLE_LIBEDIT)
6260
find_package(LibEdit)

0 commit comments

Comments
 (0)