diff options
| author | Peter Zotov <whitequark@whitequark.org> | 2014-12-30 03:24:11 +0000 |
|---|---|---|
| committer | Peter Zotov <whitequark@whitequark.org> | 2014-12-30 03:24:11 +0000 |
| commit | b45d5bd955495a067ffe1f31082cf6175798822d (patch) | |
| tree | d074a116c58771a034e3315b2bba9048b601ccf4 | |
| parent | 0bd44501c3f0eb960f65ab264be5d16f87ac74bb (diff) | |
| download | bcm5719-llvm-b45d5bd955495a067ffe1f31082cf6175798822d.tar.gz bcm5719-llvm-b45d5bd955495a067ffe1f31082cf6175798822d.zip | |
[lit] Make config.llvm_lib_dir available on cmake, too.
The OCaml tests require config.llvm_lib_dir to determine
the OCaml package search path.
llvm-svn: 224978
| -rw-r--r-- | llvm/test/Makefile | 2 | ||||
| -rw-r--r-- | llvm/test/lit.site.cfg.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/test/Makefile b/llvm/test/Makefile index 38aba65e600..7f253b06625 100644 --- a/llvm/test/Makefile +++ b/llvm/test/Makefile @@ -123,7 +123,7 @@ lit.site.cfg: FORCE @$(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=@LIBDIR@=$(LibDir)=g >> lit.tmp + @$(ECHOPATH) s=@LLVM_LIBRARY_DIR@=$(LibDir)=g >> lit.tmp @$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> lit.tmp @$(ECHOPATH) s=@SHLIBEXT@=$(SHLIBEXT)=g >> lit.tmp @$(ECHOPATH) s=@EXEEXT@=$(EXEEXT)=g >> lit.tmp diff --git a/llvm/test/lit.site.cfg.in b/llvm/test/lit.site.cfg.in index 7d2c8330531..64ad0c39842 100644 --- a/llvm/test/lit.site.cfg.in +++ b/llvm/test/lit.site.cfg.in @@ -7,7 +7,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_lib_dir = "@LIBDIR@" +config.llvm_lib_dir = "@LLVM_LIBRARY_DIR@" config.llvm_shlib_dir = "@SHLIBDIR@" config.llvm_shlib_ext = "@SHLIBEXT@" config.llvm_exe_ext = "@EXEEXT@" |
