diff options
| author | Eric Fiselier <eric@efcs.ca> | 2014-11-18 20:37:53 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2014-11-18 20:37:53 +0000 |
| commit | 5cb5051b46cb75cd4581ed98c8b14f5e8a863e4c (patch) | |
| tree | 650035af25adaa25f873df4229da308338af20d3 /libcxxabi/src | |
| parent | 90ba6230a350afcff827f7fec1a1ffce282d88e9 (diff) | |
| download | bcm5719-llvm-5cb5051b46cb75cd4581ed98c8b14f5e8a863e4c.tar.gz bcm5719-llvm-5cb5051b46cb75cd4581ed98c8b14f5e8a863e4c.zip | |
[libcxxabi] Refactor CMakeLists.txt's handling of compile and link flags to suppress warnings.
Summary:
This patch mirrors the recent change to libc++ found here http://reviews.llvm.org/D6277.
This fixes PR20395 (http://llvm.org/bugs/show_bug.cgi?id=20395).
Reviewers: jroelofs, mclow.lists, danalbert
Reviewed By: danalbert
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D6286
llvm-svn: 222252
Diffstat (limited to 'libcxxabi/src')
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | libcxxabi/src/Unwind/CMakeLists.txt | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index 774ef27945b..336785080ae 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -58,31 +58,31 @@ endif() target_link_libraries(cxxabi ${libraries}) # Setup flags. -append_if(compile_flags LIBCXXABI_HAS_FPIC_FLAG -fPIC) -append_if(link_flags LIBCXXABI_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs) +append_if(LIBCXXABI_COMPILE_FLAGS LIBCXXABI_HAS_FPIC_FLAG -fPIC) +append_if(LIBCXXABI_LINK_FLAGS LIBCXXABI_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs) if ( APPLE ) if ( CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6" ) - list(APPEND compile_flags "-U__STRICT_ANSI__") - list(APPEND link_flags + list(APPEND LIBCXXABI_COMPILE_FLAGS "-U__STRICT_ANSI__") + list(APPEND LIBCXXABI_LINK_FLAGS "-compatibility_version 1" "-current_version 1" "-install_name /usr/lib/libc++abi.1.dylib" "/usr/lib/libSystem.B.dylib") else() - list(APPEND link_flags + list(APPEND LIBCXXABI_LINK_FLAGS "-compatibility_version 1" "-install_name /usr/lib/libc++abi.1.dylib") endif() endif() -string(REPLACE ";" " " compile_flags "${compile_flags}") -string(REPLACE ";" " " link_flags "${link_flags}") +string(REPLACE ";" " " LIBCXXABI_COMPILE_FLAGS "${LIBCXXABI_COMPILE_FLAGS}") +string(REPLACE ";" " " LIBCXXABI_LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}") set_target_properties(cxxabi PROPERTIES - COMPILE_FLAGS "${compile_flags}" - LINK_FLAGS "${link_flags}" + COMPILE_FLAGS "${LIBCXXABI_COMPILE_FLAGS}" + LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}" OUTPUT_NAME "c++abi" VERSION "1.0" SOVERSION "1" diff --git a/libcxxabi/src/Unwind/CMakeLists.txt b/libcxxabi/src/Unwind/CMakeLists.txt index ff22e7f96f7..598a081ea3d 100644 --- a/libcxxabi/src/Unwind/CMakeLists.txt +++ b/libcxxabi/src/Unwind/CMakeLists.txt @@ -65,33 +65,33 @@ append_if(libraries LIBCXXABI_HAS_PTHREAD_LIB pthread) target_link_libraries(unwind ${libraries}) # Setup flags. -append_if(compile_flags LIBCXXABI_HAS_FPIC_FLAG -fPIC) -append_if(link_flags LIBCXXABI_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs) +append_if(LIBCXXABI_COMPILE_FLAGS LIBCXXABI_HAS_FPIC_FLAG -fPIC) +append_if(LIBCXXABI_LINK_FLAGS LIBCXXABI_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs) set(LIBCXXABI_UNWINDER_NAME "unwind") if ( APPLE ) if ( CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6" ) - list(APPEND compile_flags "-U__STRICT_ANSI__") - list(APPEND link_flags + list(APPEND LIBCXXABI_COMPILE_FLAGS "-U__STRICT_ANSI__") + list(APPEND LIBCXXABI_LINK_FLAGS "-compatibility_version 1" "-current_version ${LIBCXXABI_VERSION}" "-install_name /usr/lib/lib${LIBCXXABI_UNWINDER_NAME}.1.dylib" "/usr/lib/libSystem.B.dylib") else() - list(APPEND link_flags + list(APPEND LIBCXXABI_LINK_FLAGS "-compatibility_version 1" "-install_name /usr/lib/lib${LIBCXXABI_UNWINDER_NAME}.1.dylib") endif() endif() -string(REPLACE ";" " " compile_flags "${compile_flags}") -string(REPLACE ";" " " link_flags "${link_flags}") +string(REPLACE ";" " " LIBCXXABI_COMPILE_FLAGS "${LIBCXXABI_COMPILE_FLAGS}") +string(REPLACE ";" " " LIBCXXABI_LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}") set_target_properties(unwind PROPERTIES - COMPILE_FLAGS "${compile_flags}" - LINK_FLAGS "${link_flags}" + COMPILE_FLAGS "${LIBCXXABI_COMPILE_FLAGS}" + LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}" OUTPUT_NAME "${LIBCXXABI_UNWINDER_NAME}" VERSION "1.0" SOVERSION "1" |
