This is an archive of the discontinued LLVM Phabricator instance.

Differential D56800

compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac
ClosedPublic

Authored by thakis on Jan 16 2019, 12:14 PM.

Details

Reviewers
pcc
Commits
rGe5653be62a80: compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac
rL351373: compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac
rCRT351373: compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac

Diff Detail

Event Timeline

thakis created this revision.Jan 16 2019, 12:14 PM
Herald added subscribers: mgorny, dberris. · View Herald TranscriptJan 16 2019, 12:14 PM
pcc accepted this revision.Jan 16 2019, 12:27 PM

LGTM

This revision is now accepted and ready to land.Jan 16 2019, 12:27 PM
Closed by commit rCRT351373: compiler-rt tests: Unbreak cmake with LLVM_ENABLE_PIC=OFF on mac (authored by nico). · Explain WhyJan 16 2019, 12:40 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: Restricted Project. · View Herald TranscriptJan 16 2019, 12:40 PM

Revision Contents

PathSize
test/
cfi/
20 lines
safestack/
20 lines

Diff 182116

test/cfi/CMakeLists.txt

Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Linesif(COMPILER_RT_HAS_CFI)
list(APPEND CFI_TEST_DEPS cfi) list(APPEND CFI_TEST_DEPS cfi)
endif() endif()
if(NOT COMPILER_RT_STANDALONE_BUILD) if(NOT COMPILER_RT_STANDALONE_BUILD)
list(APPEND CFI_TEST_DEPS list(APPEND CFI_TEST_DEPS
opt opt
sanstats sanstats
) )
if(LLVM_ENABLE_PIC AND LLVM_BINUTILS_INCDIR) if(LLVM_ENABLE_PIC)
if(LLVM_BINUTILS_INCDIR)
list(APPEND CFI_TEST_DEPS list(APPEND CFI_TEST_DEPS
LLVMgold LLVMgold
) )
endif() endif()
if(APPLE) if(APPLE)
list(APPEND CFI_TEST_DEPS list(APPEND CFI_TEST_DEPS
LTO LTO
) )
endif() endif()
endif()
if(NOT APPLE AND COMPILER_RT_HAS_LLD) if(NOT APPLE AND COMPILER_RT_HAS_LLD)
list(APPEND CFI_TEST_DEPS list(APPEND CFI_TEST_DEPS
lld lld
) )
endif() endif()
endif() endif()
add_lit_testsuite(check-cfi "Running the cfi regression tests" add_lit_testsuite(check-cfi "Running the cfi regression tests"
Show All 10 Lines

test/safestack/CMakeLists.txt

set(SAFESTACK_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(SAFESTACK_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(SAFESTACK_LIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(SAFESTACK_LIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(SAFESTACK_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) set(SAFESTACK_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
if(NOT COMPILER_RT_STANDALONE_BUILD) if(NOT COMPILER_RT_STANDALONE_BUILD)
list(APPEND SAFESTACK_TEST_DEPS safestack) list(APPEND SAFESTACK_TEST_DEPS safestack)
# Some tests require LTO, so add a dependency on the relevant LTO plugin. # Some tests require LTO, so add a dependency on the relevant LTO plugin.
if(LLVM_ENABLE_PIC AND LLVM_BINUTILS_INCDIR) if(LLVM_ENABLE_PIC)
if(LLVM_BINUTILS_INCDIR)
list(APPEND SAFESTACK_TEST_DEPS list(APPEND SAFESTACK_TEST_DEPS
LLVMgold LLVMgold
) )
endif() endif()
if(APPLE) if(APPLE)
list(APPEND SAFESTACK_TEST_DEPS list(APPEND SAFESTACK_TEST_DEPS
LTO LTO
) )
endif() endif()
endif() endif()
endif()
configure_lit_site_cfg( configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
) )
add_lit_testsuite(check-safestack "Running the SafeStack tests" add_lit_testsuite(check-safestack "Running the SafeStack tests"
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${SAFESTACK_TEST_DEPS}) DEPENDS ${SAFESTACK_TEST_DEPS})
set_target_properties(check-safestack PROPERTIES FOLDER "Compiler-RT Misc") set_target_properties(check-safestack PROPERTIES FOLDER "Compiler-RT Misc")