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

[test] Correctly include build llvm_shlib_dir in stand-alone builds 

Add the build llvm_shlib_dir into LD_LIBRARY_PATH before the directory
specified as llvm_libs_dir, in order to fix stand-alone builds
attempting to use installed clang libraries.

In case of stand-alone builds llvm_libs_dir specifies the location of
installed LLVM libraries which can also contain an older version
(previous build) of clang libraries. Therefore, ensure to specify
llvm_shlib_dir (which is always the build tree path) before
the potentially-system llvm_libs_dir.

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

llvm-svn: 286952
This commit is contained in:
Michal Gorny 2016-11-15 12:54:10 +00:00
parent 1a7eec68a9
commit 61c3046408
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/test/lit.cfg
View File

@ -102,10 +102,15 @@ if clang_obj_root is not None:
path = os.path.pathsep.join((
clang_tools_dir, llvm_tools_dir, config.environment['PATH']))
config.environment['PATH'] = path
# in stand-alone builds, llvm_shlib_dir is clang's build tree
# while llvm_libs_dir is installed LLVM (and possibly older clang)
llvm_shlib_dir = getattr(config, 'llvm_shlib_dir', None)
if not llvm_shlib_dir:
lit_config.fatal('No LLVM shlib dir set!')
llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
if not llvm_libs_dir:
lit_config.fatal('No LLVM libs dir set!')
path = os.path.pathsep.join((llvm_libs_dir,
path = os.path.pathsep.join((llvm_shlib_dir, llvm_libs_dir,
config.environment.get('LD_LIBRARY_PATH','')))
config.environment['LD_LIBRARY_PATH'] = path