Skip to content

Commit

Permalink
Bump sanitizer macOS deployment target to 10.10
Browse files Browse the repository at this point in the history
Bump default value for `SANITIZER_MIN_OSX_VERSION` to 10.10 (from 10.9).
TSan does not work on macOS 10.9 and a nice error message is preferable
to an "unreferenced symbol" error when loading the TSan runtime.

We could try to only bump the deployment target for TSan, but we would
have to invest into adding support for this to our CMake build and it
does not seem worth it.  macOS 10.10 was released in 2014.

rdar://31335781
  • Loading branch information
Julian Lettner committed Nov 18, 2019
1 parent 0aed648 commit b87fc09
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions compiler-rt/cmake/config-ix.cmake
Expand Up @@ -357,14 +357,14 @@ if(APPLE)
elseif(CMAKE_OSX_DEPLOYMENT_TARGET)
set(SANITIZER_MIN_OSX_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
else()
set(SANITIZER_MIN_OSX_VERSION 10.9)
set(SANITIZER_MIN_OSX_VERSION 10.10)
endif()
if(SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.7")
message(FATAL_ERROR "macOS deployment target '${SANITIZER_MIN_OSX_VERSION}' is too old.")
endif()
if(SANITIZER_MIN_OSX_VERSION VERSION_GREATER "10.9")
message(WARNING "macOS deployment target '${SANITIZER_MIN_OSX_VERSION}' is too new, setting to '10.9' instead.")
set(SANITIZER_MIN_OSX_VERSION 10.9)
if(SANITIZER_MIN_OSX_VERSION VERSION_GREATER "10.10")
message(WARNING "macOS deployment target '${SANITIZER_MIN_OSX_VERSION}' is too new, setting to '10.10' instead.")
set(SANITIZER_MIN_OSX_VERSION 10.10)
endif()
endif()

Expand Down

0 comments on commit b87fc09

Please sign in to comment.