diff options
| author | Adrian Prantl <aprantl@apple.com> | 2014-01-27 22:57:33 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2014-01-27 22:57:33 +0000 |
| commit | 9f83f04225ca292229a84ce8998a6a4785576510 (patch) | |
| tree | 7260c3ccb422ce3fd58b2ca8d243b3dcedf8c495 | |
| parent | 4c78edec5f30fdc760380dd5e56a5c26317dd6f1 (diff) | |
| download | clang-9f83f04225ca292229a84ce8998a6a4785576510.tar.gz clang-9f83f04225ca292229a84ce8998a6a4785576510.tar.bz2 clang-9f83f04225ca292229a84ce8998a6a4785576510.tar.xz | |
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
| -rw-r--r-- | test/Makefile | 4 | ||||
| -rw-r--r-- | test/Unit/lit.site.cfg.in | 2 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/test/Makefile b/test/Makefile index a7f698f659..da7b965418 100644 --- 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 3df60696b6..a255cdce0d 100644 --- 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 e42f00cf40..291788f38b 100644 --- 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@" |