wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[test] Extend llvm_shlib_dir fix to unittests 

Extend the fix from rL286952 to unittests. The fix added clang built
library directories (via llvm_shlib_dir) to LD_LIBRARY_PATH.
The previous logic has used llvm_libs_dir only which points to installed
LLVM when doing stand-alone builds.

The patch also removes the redundant win32 code that is no longer
necessary now that shlibdir is used unconditionally.

Differential Revision: https://reviews.llvm.org/D27812

llvm-svn: 289865
This commit is contained in:
Michal Gorny 2016-12-15 20:31:08 +00:00
parent 603679849d
commit 391f221df6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/test/Unit/lit.cfg
View File

@ -94,15 +94,16 @@ elif platform.system() == 'Darwin':
elif platform.system() == 'Windows': elif platform.system() == 'Windows':
shlibpath_var = 'PATH' 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'. # Point the dynamic loader at dynamic libraries in 'lib'.
llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
if not llvm_libs_dir: if not llvm_libs_dir:
lit_config.fatal('No LLVM libs dir set!') 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,''))) 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 config.environment[shlibpath_var] = shlibpath