summaryrefslogtreecommitdiffstats
path: root/test/Unit/lit.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'test/Unit/lit.cfg')
-rw-r--r--test/Unit/lit.cfg9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index ff70123c..3a1da187 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -41,14 +41,17 @@ elif platform.system() == 'Windows':
shlibpath_var = 'PATH'
# Point the dynamic loader at dynamic libraries in 'lib'.
+shlibdir = getattr(config, 'shlibdir', None)
+if not shlibdir:
+ lit_config.fatal('No shlibdir set!')
llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
if not llvm_libs_dir:
lit_config.fatal('No LLVM libs dir set!')
-shlibpath = os.path.pathsep.join((llvm_libs_dir,
+shlibpath = os.path.pathsep.join((shlibdir, llvm_libs_dir,
config.environment.get(shlibpath_var,'')))
# Win32 seeks DLLs along %PATH%.
-if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):
- shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath))
+if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir):
+ shlibpath = os.path.pathsep.join((shlibdir, shlibpath))
config.environment[shlibpath_var] = shlibpath