From c90171961d020d93e4ce548016d8ccb8aab00c57 Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Thu, 25 Feb 2010 06:34:33 +0000 Subject: Try r96559 for the third time. This time the shared library is only built if --enable-shared is passed to configure. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97119 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Unit/lit.cfg | 9 ++++++++- test/Unit/lit.site.cfg.in | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'test/Unit') diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 34372bb..5fe0732 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -23,7 +23,14 @@ config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests') ### -import os +# 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 + config.environment[config.shlibpath_var] = shlibpath # Check that the object root is known. if config.test_exec_root is None: diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in index c190ffa..51b5bc4 100644 --- a/test/Unit/lit.site.cfg.in +++ b/test/Unit/lit.site.cfg.in @@ -5,6 +5,8 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvmgcc_dir = "@LLVMGCCDIR@" config.llvm_build_mode = "@LLVM_BUILD_MODE@" +config.enable_shared = @ENABLE_SHARED@ +config.shlibpath_var = "@SHLIBPATH_VAR@" # Let the main config do the real work. lit.load_config(config, "@LLVM_SOURCE_DIR@/test/Unit/lit.cfg") -- cgit v1.1