diff options
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 5 | ||||
| -rw-r--r-- | compiler-rt/lib/profile/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index ff3627122eb..f07b10016b8 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -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) diff --git a/compiler-rt/lib/profile/CMakeLists.txt b/compiler-rt/lib/profile/CMakeLists.txt index fe1afcc75c1..b9f5b0fbbc8 100644 --- a/compiler-rt/lib/profile/CMakeLists.txt +++ b/compiler-rt/lib/profile/CMakeLists.txt @@ -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) |
