diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2016-09-22 20:51:48 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-09-22 20:51:48 +0000 |
| commit | 18d49e2643099b77104651e6a2d0ac0f277887c7 (patch) | |
| tree | dbf4690be3ff94bcc80e155f373caaa9bdc369cf /cmake | |
| parent | 08cd4cf2f65789d8ccc89be522d249423e9ef3d3 (diff) | |
cfi: Fixes for check-cfi when configured as an external project.
Differential Revision: https://reviews.llvm.org/D24817
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@282189 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/CompilerRTUtils.cmake | 2 | ||||
| -rw-r--r-- | cmake/config-ix.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake index 3fa50c8ad..ae389ba05 100644 --- a/cmake/Modules/CompilerRTUtils.cmake +++ b/cmake/Modules/CompilerRTUtils.cmake @@ -219,7 +219,7 @@ macro(load_llvm_config) include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") set(LLVM_LIBRARY_OUTPUT_INTDIR - ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) + ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) endmacro() macro(construct_compiler_rt_default_triple) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 63f81cd30..2cefff577 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -400,6 +400,8 @@ else() set(CAN_SYMBOLIZE 1) endif() +find_program(GOLD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.gold ld.gold ${LLVM_DEFAULT_TARGET_TRIPLE}-ld ld DOC "The gold linker") + message(STATUS "Compiler-RT supported architectures: ${COMPILER_RT_SUPPORTED_ARCH}") if(ANDROID) |