diff options
| -rw-r--r-- | clang/test/Makefile | 1 | ||||
| -rw-r--r-- | clang/test/Unit/lit.site.cfg.in | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/clang/test/Makefile b/clang/test/Makefile index 55250a79c4e..a7f698f6593 100644 --- a/clang/test/Makefile +++ b/clang/test/Makefile @@ -55,6 +55,7 @@ lit.site.cfg: FORCE Unit/lit.site.cfg: FORCE @echo "Making Clang 'Unit/lit.site.cfg' file..." @$(MKDIR) $(dir $@) + @$(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 @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> unit.tmp diff --git a/clang/test/Unit/lit.site.cfg.in b/clang/test/Unit/lit.site.cfg.in index cfa0cc69937..3df60696b68 100644 --- a/clang/test/Unit/lit.site.cfg.in +++ b/clang/test/Unit/lit.site.cfg.in @@ -2,6 +2,7 @@ import sys ## Autogenerated by LLVM/Clang configuration. # Do not edit! +config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_libs_dir = "@LLVM_LIBS_DIR@" config.llvm_build_mode = "@LLVM_BUILD_MODE@" config.clang_obj_root = "@CLANG_BINARY_DIR@" @@ -14,6 +15,7 @@ config.target_triple = "@TARGET_TRIPLE@" # parameters. This is used when we can't determine the tool dir at # configuration time. try: + config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params config.llvm_build_mode = config.llvm_build_mode % lit_config.params except KeyError: |
