Reverting because reverting r200145.

Revert "check-clang doesn't require neither llvm_src_root nor llvm_obj_root."

This reverts commit r200146.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200261 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index a7f698f65935d2c999fca21b66edac2e22fc77e6..da7b96541807b28c3fd44fff53b6154515ef87bd 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -38,6 +38,8 @@ FORCE:
 
 lit.site.cfg: FORCE
        @echo "Making Clang 'lit.site.cfg' file..."
+       @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp
+       @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp
        @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
        @$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> lit.tmp
        @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp
@@ -55,6 +57,8 @@ lit.site.cfg: FORCE
 Unit/lit.site.cfg: FORCE
        @echo "Making Clang 'Unit/lit.site.cfg' file..."
        @$(MKDIR) $(dir $@)
+       @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > unit.tmp
+       @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> unit.tmp
        @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> unit.tmp
        @$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> unit.tmp
        @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> unit.tmp

diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in
index 3df60696b68bdb5b254a3fa2fe3a4cbeecbbc6fd..a255cdce0de8c557334c66ddc1dad6622914da59 100644 (file)
--- a/test/Unit/lit.site.cfg.in
+++ b/test/Unit/lit.site.cfg.in
@@ -2,6 +2,8 @@ import sys
 
 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.llvm_build_mode = "@LLVM_BUILD_MODE@"

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index e42f00cf4014dcf9cac349b1065a8befeee81b2d..291788f38b2b3e29ab30aabafb7e13fdd80596c7 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -2,6 +2,8 @@ import sys
 
 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.llvm_shlib_dir = "@SHLIBDIR@"