mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 04:02:41 +01:00
Revert "Build libSupport with -Werror=global-constructors (NFC)"
This reverts commit beff86e8ff429f11da6fe37efde86d22ea636ed5. The sanitizer-x86_64-linux bot is still broken.
This commit is contained in:
parent
64c9fc2e9c
commit
ac19c5a542
@ -1,26 +1,5 @@
|
|||||||
include(GetLibraryName)
|
include(GetLibraryName)
|
||||||
|
|
||||||
# Ensure that libSupport does not carry any static global initializer.
|
|
||||||
# libSupport can be embedded in use cases where we don't want to load all
|
|
||||||
# cl::opt unless we want to parse the command line.
|
|
||||||
# ManagedStatic can be used to enable lazy-initialization of globals.
|
|
||||||
# We don't use `add_flag_if_supported` as instead of compiling an empty file we
|
|
||||||
# check if the current platform is able to compile global std::mutex with this
|
|
||||||
# flag (Linux can, Darwin can't for example).
|
|
||||||
check_cxx_compiler_flag("-Werror=global-constructors" HAS_WERROR_GLOBAL_CTORS)
|
|
||||||
if (HAS_WERROR_GLOBAL_CTORS)
|
|
||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=global-constructors")
|
|
||||||
CHECK_CXX_SOURCE_COMPILES("
|
|
||||||
#include <mutex>
|
|
||||||
static std::mutex TestGlobalCtorDtor;
|
|
||||||
static std::recursive_mutex TestGlobalCtorDtor2;
|
|
||||||
int main() { (void)TestGlobalCtorDtor; (void)TestGlobalCtorDtor2; return 0;}
|
|
||||||
" LLVM_HAS_NOGLOBAL_CTOR_MUTEX)
|
|
||||||
if (NOT LLVM_HAS_NOGLOBAL_CTOR_MUTEX)
|
|
||||||
string(REPLACE "-Werror=global-constructors" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(LLVM_ENABLE_ZLIB)
|
if(LLVM_ENABLE_ZLIB)
|
||||||
set(imported_libs ZLIB::ZLIB)
|
set(imported_libs ZLIB::ZLIB)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user