diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2014-10-15 18:23:57 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2014-10-15 18:23:57 +0000 |
| commit | 1d7819bcce8836dc543e200d6acc1fac8ded0a36 (patch) | |
| tree | bbd5a4f1841bc267496ade0d39d3497fc34f9719 | |
| parent | e7d13c31c0ed41ecd21c1c239622e8f5d5443af2 (diff) | |
[CMake] Cleanup CMake rules after r219302. NFC.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@219825 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | cmake/Modules/CompilerRTUtils.cmake | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b5333db46..777c6fe07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,10 +198,6 @@ else() option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" OFF) endif() -# Check if compiler-rt is built with libc++. -find_flag_in_string("${CMAKE_CXX_FLAGS}" "-stdlib=libc++" - COMPILER_RT_USES_LIBCXX) - option(COMPILER_RT_DEBUG "Build runtimes with full debug info" OFF) # COMPILER_RT_DEBUG_PYBOOL is used by lit.common.configured.in. pythonize_bool(COMPILER_RT_DEBUG) @@ -296,14 +292,10 @@ if(APPLE) list(APPEND SANITIZER_COMMON_SUPPORTED_DARWIN_OS iossim) endif() - if(COMPILER_RT_USES_LIBCXX) - set(SANITIZER_MIN_OSX_VERSION 10.7) - else() - set(SANITIZER_MIN_OSX_VERSION 10.7) - endif() + set(SANITIZER_MIN_OSX_VERSION 10.7) set(CMAKE_OSX_DEPLOYMENT_TARGET "") # We're setting the flag manually below. set(DARWIN_osx_CFLAGS -mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION}) - set(DARWIN_iossim_CFLAGS + set(DARWIN_iossim_CFLAGS -mios-simulator-version-min=7.0 -isysroot ${IOSSIM_SDK_DIR}) set(DARWIN_osx_LINKFLAGS) set(DARWIN_iossim_LINKFLAGS diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake index e22e77535..f355627a5 100644 --- a/cmake/Modules/CompilerRTUtils.cmake +++ b/cmake/Modules/CompilerRTUtils.cmake @@ -15,18 +15,6 @@ function(set_target_link_flags target) set_property(TARGET ${target} PROPERTY LINK_FLAGS "${argstring}") endfunction() -# Check if a given flag is present in a space-separated flag_string. -# Store the result in out_var. -function(find_flag_in_string flag_string flag out_var) - string(REPLACE " " ";" flag_list "${flag_string}") - list(FIND flag_list ${flag} flag_pos) - if(NOT flag_pos EQUAL -1) - set(${out_var} TRUE PARENT_SCOPE) - else() - set(${out_var} FALSE PARENT_SCOPE) - endif() -endfunction() - # Set the variable var_PYBOOL to True if var holds a true-ish string, # otherwise set it to False. macro(pythonize_bool var) |