maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libc++abi] Don't set POSITION_INDEPENDENT_CODE when building static library 

With the current WebAssembly backend, objects built with -fPIC are not
compatible with static linking.  libc++abi was (mistakenly?) adding
-fPIC to the objects it was including in a static library.

IIUC this change should also mean the static build can be more efficient
on all platforms.

Differential Revision: https://reviews.llvm.org/D60005

llvm-svn: 357322
This commit is contained in:
Sam Clegg 2019-03-29 22:08:56 +00:00
parent 5f0c4c67bb
commit 31a991eeba
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libcxxabi/src/CMakeLists.txt
View File

@ -153,9 +153,7 @@ macro(cxxabi_object_library name)
CXX_STANDARD_REQUIRED
ON
COMPILE_FLAGS
"${LIBCXXABI_COMPILE_FLAGS}"
POSITION_INDEPENDENT_CODE
ON)
"${LIBCXXABI_COMPILE_FLAGS}")
if(ARGS_DEFINES)
target_compile_definitions(${name} PRIVATE ${ARGS_DEFINES})
@ -174,15 +172,14 @@ if(LIBCXXABI_HERMETIC_STATIC_LIBRARY)
_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS
_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
FLAGS ${CXXABI_STATIC_OBJECTS_FLAGS})
cxxabi_object_library(cxxabi_shared_objects)
set(cxxabi_static_sources $<TARGET_OBJECTS:cxxabi_static_objects>)
set(cxxabi_shared_sources $<TARGET_OBJECTS:cxxabi_shared_objects>)
else()
cxxabi_object_library(cxxabi_objects)
set(cxxabi_static_sources $<TARGET_OBJECTS:cxxabi_objects>)
set(cxxabi_shared_sources $<TARGET_OBJECTS:cxxabi_objects>)
cxxabi_object_library(cxxabi_static_objects)
endif()
cxxabi_object_library(cxxabi_shared_objects POSITION_INDEPENDENT_CODE ON)
set(cxxabi_static_sources $<TARGET_OBJECTS:cxxabi_static_objects>)
set(cxxabi_shared_sources $<TARGET_OBJECTS:cxxabi_shared_objects>)
# Build the shared library.
if (LIBCXXABI_ENABLE_SHARED)
add_library(cxxabi_shared SHARED ${cxxabi_shared_sources})
@ -238,9 +235,7 @@ if (LIBCXXABI_ENABLE_STATIC)
LINK_FLAGS
"${LIBCXXABI_LINK_FLAGS}"
OUTPUT_NAME
"c++abi"
POSITION_INDEPENDENT_CODE
ON)
"c++abi")
list(APPEND LIBCXXABI_BUILD_TARGETS "cxxabi_static")
if (LIBCXXABI_INSTALL_STATIC_LIBRARY)
list(APPEND LIBCXXABI_INSTALL_TARGETS "cxxabi_static")