This is an archive of the discontinued LLVM Phabricator instance.

Differential D4873

[compiler-rt] Fix the CMake build when setting MACOSX_DEPLOYMENT_TARGET
ClosedPublic

Authored by hans on Aug 12 2014, 12:05 PM.

Details

Reviewers
samsonov
Summary

If we don't reset CMAKE_OSX_DEPLOYMENT_TARGET, it will end up in
CFLAGS together with the -mmacosx-version-min that we set,
and the compiler errors about the conflict.

Diff Detail

Event Timeline

hans updated this revision to Diff 12411.Aug 12 2014, 12:05 PM
hans retitled this revision from to [compiler-rt] Fix the CMake build when setting MACOSX_DEPLOYMENT_TARGET.
hans updated this object.
hans edited the test plan for this revision. (Show Details)
hans added a reviewer: samsonov.
hans added subscribers: Unknown Object (MLST), hansw.
samsonov accepted this revision.Aug 12 2014, 12:54 PM
samsonov edited edge metadata.

LGTM

This revision is now accepted and ready to land.Aug 12 2014, 12:54 PM
hans closed this revision.Aug 12 2014, 1:13 PM

Committed r215468.

Revision Contents

PathSize
1 line

Diff 12411

CMakeLists.txt

Context not available.
else() else()
set(SANITIZER_MIN_OSX_VERSION 10.6) set(SANITIZER_MIN_OSX_VERSION 10.6)
endif() endif()
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_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}) -mios-simulator-version-min=7.0 -isysroot ${IOSSIM_SDK_DIR})
Context not available.