diff options
Diffstat (limited to 'test/Unit/lit.cfg')
| -rw-r--r-- | test/Unit/lit.cfg | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 4fa6e78ed63b..39fad0099ceb 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -94,15 +94,16 @@ elif platform.system() == 'Darwin': elif platform.system() == 'Windows': shlibpath_var = 'PATH' +# in stand-alone builds, shlibdir is clang's build tree +# while llvm_libs_dir is installed LLVM (and possibly older clang) +llvm_shlib_dir = getattr(config, 'shlibdir', None) +if not llvm_shlib_dir: + lit_config.fatal('No shlibdir set!') # Point the dynamic loader at dynamic libraries in 'lib'. 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((llvm_shlib_dir, 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)) - config.environment[shlibpath_var] = shlibpath |