This is an archive of the discontinued LLVM Phabricator instance.

Differential D17556

[CMake] Default CMAKE_MACOSX_RPATH to On, this is the default with CMP0042
ClosedPublic

Authored by beanz on Feb 23 2016, 5:06 PM.

Details

Reviewers
samsonov
zaks.anna
Commits
rG956eceae9f21: [CMake] Default CMAKE_MACOSX_RPATH to On, this is the default with CMP0042
rCRT261797: [CMake] Default CMAKE_MACOSX_RPATH to On, this is the default with CMP0042
rL261797: [CMake] Default CMAKE_MACOSX_RPATH to On, this is the default with CMP0042
Summary

Building the sanitizer libraries without rpaths causes all sorts of problems when you try to use them. This simple fix should make it all work.

Diff Detail

Event Timeline

beanz updated this revision to Diff 48862.Feb 23 2016, 5:06 PM
beanz retitled this revision from to [CMake] Default CMAKE_MACOSX_RPATH to On, this is the default with CMP0042.
beanz updated this object.
beanz added reviewers: samsonov, zaks.anna.
beanz added a subscriber: llvm-commits.
samsonov accepted this revision.Feb 23 2016, 5:32 PM
samsonov edited edge metadata.

LGTM

This revision is now accepted and ready to land.Feb 23 2016, 5:32 PM
Closed by commit rL261797: [CMake] Default CMAKE_MACOSX_RPATH to On, this is the default with CMP0042 (authored by cbieneman). · Explain WhyFeb 24 2016, 2:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
6 lines

Diff 48862

CMakeLists.txt

Show All 25 Lineselse()
cmake_minimum_required(VERSION 2.8.12.1) cmake_minimum_required(VERSION 2.8.12.1)
endif() endif()
# FIXME: It may be removed when we use 2.8.12. # FIXME: It may be removed when we use 2.8.12.
if(CMAKE_VERSION VERSION_LESS 2.8.12) if(CMAKE_VERSION VERSION_LESS 2.8.12)
# Invalidate a couple of keywords. # Invalidate a couple of keywords.
set(cmake_2_8_12_INTERFACE) set(cmake_2_8_12_INTERFACE)
set(cmake_2_8_12_PRIVATE) set(cmake_2_8_12_PRIVATE)
if(APPLE)
set(CMAKE_MACOSX_RPATH On)
endif
else() else()
# Use ${cmake_2_8_12_KEYWORD} intead of KEYWORD in target_link_libraries(). # Use ${cmake_2_8_12_KEYWORD} intead of KEYWORD in target_link_libraries().
set(cmake_2_8_12_INTERFACE INTERFACE) set(cmake_2_8_12_INTERFACE INTERFACE)
set(cmake_2_8_12_PRIVATE PRIVATE) set(cmake_2_8_12_PRIVATE PRIVATE)
if(POLICY CMP0022) if(POLICY CMP0022)
cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
endif() endif()
if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW) # automatic when 2.8.12 is required
endif()
endif() endif()
# Top level target used to build all compiler-rt libraries. # Top level target used to build all compiler-rt libraries.
add_custom_target(compiler-rt ALL) add_custom_target(compiler-rt ALL)
option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON) option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON)
mark_as_advanced(COMPILER_RT_BUILD_BUILTINS) mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON) option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON)
▲ Show 20 Lines • Show All 282 Lines • Show Last 20 Lines