File tree Expand file tree Collapse file tree 2 files changed +1
-14
lines changed Expand file tree Collapse file tree 2 files changed +1
-14
lines changed Original file line number Diff line number Diff line change 2
2
# if the user has requested it.
3
3
4
4
include (DetermineGCCCompatible )
5
- include (CheckIncludeFiles )
6
5
7
6
if (NOT DEFINED LLVM_STDLIB_HANDLED )
8
7
set (LLVM_STDLIB_HANDLED ON )
@@ -20,17 +19,7 @@ if(NOT DEFINED LLVM_STDLIB_HANDLED)
20
19
if (LLVM_COMPILER_IS_GCC_COMPATIBLE )
21
20
check_cxx_compiler_flag ("-stdlib=libc++" CXX_COMPILER_SUPPORTS_STDLIB )
22
21
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 )
34
23
append ("-stdlib=libc++"
35
24
CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS
36
25
CMAKE_MODULE_LINKER_FLAGS )
Original file line number Diff line number Diff line change @@ -55,8 +55,6 @@ endif()
55
55
56
56
set (LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@ )
57
57
58
- set (LLVM_ENABLE_LIBCXX @LLVM_ENABLE_LIBCXX@ )
59
-
60
58
set (LLVM_ENABLE_LIBEDIT @HAVE_LIBEDIT@ )
61
59
if (LLVM_ENABLE_LIBEDIT )
62
60
find_package (LibEdit )
You can’t perform that action at this time.
0 commit comments