diff options
| author | Greg Bedwell <greg_bedwell@sn.scee.net> | 2017-11-13 12:57:54 +0000 |
|---|---|---|
| committer | Greg Bedwell <greg_bedwell@sn.scee.net> | 2017-11-13 12:57:54 +0000 |
| commit | d6b0ecb79514e4c188e725e33b4bc92f5213f602 (patch) | |
| tree | 3558ecf0d1317beb83e0a2358237b91fbaee23d6 /compiler-rt/unittests | |
| parent | 2aa707bdaa66be12dfa7f732b1c0c84fb9629a38 (diff) | |
| download | bcm5719-llvm-d6b0ecb79514e4c188e725e33b4bc92f5213f602.tar.gz bcm5719-llvm-d6b0ecb79514e4c188e725e33b4bc92f5213f602.zip | |
Allow compiler-rt test targets to work with multi-config CMake generators
Multi-config CMake generators need lit to be able to resolve paths of
artifacts from previous build steps at lit time, rather than expect them
to be fully resolved at CMake time as they may contain the build mode.
Differential Revision: https://reviews.llvm.org/D38471
llvm-svn: 318037
Diffstat (limited to 'compiler-rt/unittests')
| -rw-r--r-- | compiler-rt/unittests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | compiler-rt/unittests/lit.common.unit.configured.in | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler-rt/unittests/CMakeLists.txt b/compiler-rt/unittests/CMakeLists.txt index e5059bd914e..88f9865a6e7 100644 --- a/compiler-rt/unittests/CMakeLists.txt +++ b/compiler-rt/unittests/CMakeLists.txt @@ -1,6 +1,6 @@ -# Needed for lit support +# Needed for lit support in standalone builds. include(AddLLVM) -configure_lit_site_cfg( +configure_compiler_rt_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in ${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured) diff --git a/compiler-rt/unittests/lit.common.unit.configured.in b/compiler-rt/unittests/lit.common.unit.configured.in index dd36985fed5..fafac19b759 100644 --- a/compiler-rt/unittests/lit.common.unit.configured.in +++ b/compiler-rt/unittests/lit.common.unit.configured.in @@ -4,9 +4,9 @@ config.target_triple = "@TARGET_TRIPLE@" config.llvm_src_root = "@LLVM_MAIN_SRC_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" -config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@" +config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@" -config.compiler_rt_libdir = "@COMPILER_RT_LIBRARY_OUTPUT_DIR@" +config.compiler_rt_libdir = "@COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR@" config.llvm_build_mode = "@LLVM_BUILD_MODE@" config.host_arch = "@HOST_ARCH@" config.host_os = "@HOST_OS@" @@ -15,6 +15,7 @@ config.host_os = "@HOST_OS@" # so try to apply substitution. try: config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params + config.compiler_rt_libdir = config.compiler_rt_libdir % lit_config.params config.llvm_build_mode = config.llvm_build_mode % lit_config.params except KeyError as e: key, = e.args |
