[compiler-rt] r248948 - [CMake] [Darwin] Add and populate PROFILE_SUPPORTED_OS to enable building libclang_rt.profile for iOS.

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Wed Sep 30 16:23:22 2015
New Revision: 248948

URL: http://llvm.org/viewvc/llvm-project?rev=248948&view=rev
Log:
[CMake] [Darwin] Add and populate PROFILE_SUPPORTED_OS to enable building libclang_rt.profile for iOS.

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake
    compiler-rt/trunk/lib/profile/CMakeLists.txt

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=248948&r1=248947&r2=248948&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Wed Sep 30 16:23:22 2015
@@ -288,6 +288,7 @@ if(APPLE)
   # be 10.8 or higher.
   set(SANITIZER_COMMON_SUPPORTED_OS osx)
   set(BUILTIN_SUPPORTED_OS osx)
+  set(PROFILE_SUPPORTED_OS osx)
   if(NOT SANITIZER_MIN_OSX_VERSION)
     string(REGEX MATCH "-mmacosx-version-min=([.0-9]+)"
            MACOSX_VERSION_MIN_FLAG "${CMAKE_CXX_FLAGS}")
@@ -393,6 +394,7 @@ if(APPLE)
 
       list(APPEND SANITIZER_COMMON_SUPPORTED_OS ios)
       list(APPEND BUILTIN_SUPPORTED_OS ios)
+      list(APPEND PROFILE_SUPPORTED_OS ios)
       darwin_test_archs(ios
         DARWIN_ios_ARCHS
         ${toolchain_arches})
@@ -427,10 +429,9 @@ if(APPLE)
   list_union(MSAN_SUPPORTED_ARCH
     ALL_MSAN_SUPPORTED_ARCH
     SANITIZER_COMMON_SUPPORTED_ARCH)
-  # Note: profiles is only built for OS X
   list_union(PROFILE_SUPPORTED_ARCH
     ALL_PROFILE_SUPPORTED_ARCH
-    DARWIN_osx_ARCHS)
+    SANITIZER_COMMON_SUPPORTED_ARCH)
   list_union(TSAN_SUPPORTED_ARCH
     ALL_TSAN_SUPPORTED_ARCH
     SANITIZER_COMMON_SUPPORTED_ARCH)

Modified: compiler-rt/trunk/lib/profile/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/CMakeLists.txt?rev=248948&r1=248947&r2=248948&view=diff
==============================================================================
--- compiler-rt/trunk/lib/profile/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/profile/CMakeLists.txt Wed Sep 30 16:23:22 2015
@@ -13,7 +13,7 @@ set(PROFILE_SOURCES
 if(APPLE)
   add_compiler_rt_runtime(clang_rt.profile
     STATIC
-    OS osx
+    OS ${PROFILE_SUPPORTED_OS}
     ARCHS ${PROFILE_SUPPORTED_ARCH}
     SOURCES ${PROFILE_SOURCES}
     PARENT_TARGET profile)