summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2016-01-27 21:36:38 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2016-01-27 21:36:38 +0000
commitf21dd9f443ea9580bd3b39c88ee85b4219273337 (patch)
tree65edc29a991755300f80a39cf0576ede994d10c4
parentcff640958bde56788657d0d5e312b97c44250eeb (diff)
[CMake] Set llvm_tools_dir to LLVM_TOOLS_BINARY_DIR instead of LLVM_TOOLS_DIR
In this way, it should work for both in-LLVM and standalone compiler-rt build. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@258991 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/asan/lit.site.cfg.in1
-rw-r--r--test/lit.common.configured.in2
-rw-r--r--unittests/lit.common.unit.configured.in2
3 files changed, 2 insertions, 3 deletions
diff --git a/test/asan/lit.site.cfg.in b/test/asan/lit.site.cfg.in
index 332f9ad9f..1e83c749f 100644
--- a/test/asan/lit.site.cfg.in
+++ b/test/asan/lit.site.cfg.in
@@ -6,7 +6,6 @@ config.name_suffix = "@ASAN_TEST_CONFIG_SUFFIX@"
config.asan_lit_source_dir = "@ASAN_LIT_SOURCE_DIR@"
config.target_cflags = "@ASAN_TEST_TARGET_CFLAGS@"
config.clang = "@ASAN_TEST_TARGET_CC@"
-config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@"
config.bits = "@ASAN_TEST_BITS@"
config.android = "@ANDROID@"
config.asan_dynamic = @ASAN_TEST_DYNAMIC@
diff --git a/test/lit.common.configured.in b/test/lit.common.configured.in
index 010ff3988..da8b6c7f9 100644
--- a/test/lit.common.configured.in
+++ b/test/lit.common.configured.in
@@ -17,7 +17,7 @@ set_default("llvm_src_root", "@LLVM_SOURCE_DIR@")
set_default("llvm_obj_root", "@LLVM_BINARY_DIR@")
set_default("compiler_rt_src_root", "@COMPILER_RT_SOURCE_DIR@")
set_default("compiler_rt_obj_root", "@COMPILER_RT_BINARY_DIR@")
-set_default("llvm_tools_dir", "@LLVM_TOOLS_DIR@")
+set_default("llvm_tools_dir", "@LLVM_TOOLS_BINARY_DIR@")
set_default("llvm_shlib_dir", "@SHLIBDIR@")
set_default("gold_executable", "@GOLD_EXECUTABLE@")
set_default("clang", "@COMPILER_RT_TEST_COMPILER@")
diff --git a/unittests/lit.common.unit.configured.in b/unittests/lit.common.unit.configured.in
index 18adf6482..85bb91da3 100644
--- a/unittests/lit.common.unit.configured.in
+++ b/unittests/lit.common.unit.configured.in
@@ -5,7 +5,7 @@
config.target_triple = "@TARGET_TRIPLE@"
config.llvm_src_root = "@LLVM_SOURCE_DIR@"
config.llvm_obj_root = "@LLVM_BINARY_DIR@"
-config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@"
config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
config.compiler_rt_libdir = "@COMPILER_RT_LIBRARY_OUTPUT_DIR@"
config.llvm_build_mode = "@LLVM_BUILD_MODE@"