diff options
Diffstat (limited to 'test/Unit')
| -rw-r--r-- | test/Unit/lit.cfg | 5 | ||||
| -rw-r--r-- | test/Unit/lit.site.cfg.in | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 5fe0732..a41f093 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -25,11 +25,10 @@ config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests') # If necessary, point the dynamic loader at libLLVM.so. if config.enable_shared: - libdir = os.path.join(config.llvm_obj_root, config.llvm_build_mode, 'lib') shlibpath = config.environment.get(config.shlibpath_var,'') if shlibpath: - shlibpath = ':' + shlibpath - shlibpath = libdir + shlibpath + shlibpath = os.pathsep + shlibpath + shlibpath = config.shlibdir + shlibpath config.environment[config.shlibpath_var] = shlibpath # Check that the object root is known. diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in index 75932a4..9643507 100644 --- a/test/Unit/lit.site.cfg.in +++ b/test/Unit/lit.site.cfg.in @@ -6,6 +6,7 @@ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvmgcc_dir = "@LLVMGCCDIR@" config.llvm_build_mode = "@LLVM_BUILD_MODE@" config.enable_shared = @ENABLE_SHARED@ +config.shlibdir = "@SHLIBDIR@" config.shlibpath_var = "@SHLIBPATH_VAR@" # Support substitution of the tools_dir and build_mode with user parameters. |