diff options
| author | Justin Bogner <mail@justinbogner.com> | 2016-03-14 21:54:45 +0000 |
|---|---|---|
| committer | Justin Bogner <mail@justinbogner.com> | 2016-03-14 21:54:45 +0000 |
| commit | 3479006400dc462daced950e112b51ed1290c98d (patch) | |
| tree | 74c8aeeca12220550d2c4daaf29c6dd342572ba8 /CMakeLists.txt | |
| parent | 07a4ec0dd5c92741d21d1a38a12c8f406e5b6d71 (diff) | |
llvm-shlib: Remove the option to override __cxa_atexit
If anybody is actually using this, it probably doesn't do what they
think it does. This actually causes the dylib to *export* a
__cxa_atexit symbol, so anything that links it probably loses their
exit time destructors as well as disabling LLVM's.
This just removes the option entirely. If somebody does need this
behaviour we should figure out a more principled way to do it.
This is effectively a revert of r223805.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@263498 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c07e84a293a..27d9c0a52c1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -392,14 +392,6 @@ if(LLVM_LINK_LLVM_DYLIB OR LLVM_BUILD_LLVM_C_DYLIB) set(LLVM_BUILD_LLVM_DYLIB_default ON) endif() option(LLVM_BUILD_LLVM_DYLIB "Build libllvm dynamic library" ${LLVM_BUILD_LLVM_DYLIB_default}) -set(LLVM_DISABLE_LLVM_DYLIB_ATEXIT_DEFAULT ON) -if (LLVM_LINK_LLVM_DYLIB) - set(LLVM_DISABLE_LLVM_DYLIB_ATEXIT_DEFAULT OFF) -endif() -option(LLVM_DISABLE_LLVM_DYLIB_ATEXIT "Disable llvm-shlib's atexit destructors." ${LLVM_DISABLE_LLVM_DYLIB_ATEXIT_DEFAULT}) -if(LLVM_DISABLE_LLVM_DYLIB_ATEXIT) - set(DISABLE_LLVM_DYLIB_ATEXIT 1) -endif() option(LLVM_OPTIMIZED_TABLEGEN "Force TableGen to be built with optimization" OFF) if(CMAKE_CROSSCOMPILING OR (LLVM_OPTIMIZED_TABLEGEN AND LLVM_ENABLE_ASSERTIONS)) @@ -778,7 +770,7 @@ if(LLVM_DISTRIBUTION_COMPONENTS) if(CMAKE_CONFIGURATION_TYPES) message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)") endif() - + add_custom_target(distribution) add_custom_target(install-distribution) foreach(target ${LLVM_DISTRIBUTION_COMPONENTS}) |