shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remember LLVM_ENABLE_LIBCXX setting in installed configuration" (#153898)

Browse Source 
Reverts llvm/llvm-project#139712

Caused an lld relocation issue as shown below:

https://logs.chromium.org/logs/fuchsia/buildbucket/cr-buildbucket/8706642902273983073/+/u/clang/build/stdout
This commit is contained in:
gulfemsavrun 2025-08-15 16:45:40 -07:00 committed by GitHub
parent e68989b930
commit f396657bf9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/cmake/modules/HandleLLVMStdlib.cmake
View File

@ -2,7 +2,6 @@
# if the user has requested it.
include(DetermineGCCCompatible)
include(CheckIncludeFiles)
if(NOT DEFINED LLVM_STDLIB_HANDLED)
set(LLVM_STDLIB_HANDLED ON)
@ -20,17 +19,7 @@ if(NOT DEFINED LLVM_STDLIB_HANDLED)
if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
check_cxx_compiler_flag("-stdlib=libc++" CXX_COMPILER_SUPPORTS_STDLIB)
check_linker_flag(CXX "-stdlib=libc++" CXX_LINKER_SUPPORTS_STDLIB)
# Check whether C++ include files are available
# runtimes/CMakeLists.txt adds -nostdlib++ and -nostdinc++ to
# CMAKE_REQUIRED_FLAGS, which are incompatible with -stdlib=libc++; use
# a fresh CMAKE_REQUIRED_FLAGS environment.
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -stdlib=libc++")
check_include_files("chrono" CXX_COMPILER_SUPPORTS_STDLIB_CHRONO LANGUAGE CXX)
cmake_pop_check_state()
if(CXX_COMPILER_SUPPORTS_STDLIB AND CXX_LINKER_SUPPORTS_STDLIB AND CXX_COMPILER_SUPPORTS_STDLIB_CHRONO)
if(CXX_COMPILER_SUPPORTS_STDLIB AND CXX_LINKER_SUPPORTS_STDLIB)
append("-stdlib=libc++"
CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS
CMAKE_MODULE_LINKER_FLAGS)

2
llvm/cmake/modules/LLVMConfig.cmake.in
View File

@ -55,8 +55,6 @@ endif()
set(LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@)
set(LLVM_ENABLE_LIBCXX @LLVM_ENABLE_LIBCXX@)
set(LLVM_ENABLE_LIBEDIT @HAVE_LIBEDIT@)
if(LLVM_ENABLE_LIBEDIT)
find_package(LibEdit)