diff options
| -rw-r--r-- | lldb/lit/Suite/lit.cfg | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lldb/lit/Suite/lit.cfg b/lldb/lit/Suite/lit.cfg index 24dc8682f39..a0d4dc4ff31 100644 --- a/lldb/lit/Suite/lit.cfg +++ b/lldb/lit/Suite/lit.cfg @@ -31,7 +31,6 @@ if 'Address' in config.llvm_use_sanitizer: 'libclang_rt.asan_osx_dynamic.dylib') config.environment['DYLD_INSERT_LIBRARIES'] = runtime -# Shared library build of LLVM may require LD_LIBRARY_PATH or equivalent. def find_shlibpath_var(): if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'SunOS']: yield 'LD_LIBRARY_PATH' @@ -40,18 +39,21 @@ def find_shlibpath_var(): elif platform.system() == 'Windows': yield 'PATH' -for shlibpath_var in find_shlibpath_var(): - # In stand-alone build llvm_shlib_dir specifies LLDB's lib directory - # while llvm_libs_dir specifies LLVM's lib directory. - shlibpath = os.path.pathsep.join( - (config.llvm_shlib_dir, - config.llvm_libs_dir, - config.environment.get(shlibpath_var, ''))) - config.environment[shlibpath_var] = shlibpath - break -else: - lit_config.warning("unable to inject shared library path on '{}'" - .format(platform.system())) +if not config.environment['DYLD_INSERT_LIBRARIES']: + # Shared library build of LLVM may require LD_LIBRARY_PATH or equivalent. + # This clashes with DYLD_INSERT_LIBRARIES which is needed on Darwin. + for shlibpath_var in find_shlibpath_var(): + # In stand-alone build llvm_shlib_dir specifies LLDB's lib directory while + # llvm_libs_dir specifies LLVM's lib directory. + shlibpath = os.path.pathsep.join( + (config.llvm_shlib_dir, + config.llvm_libs_dir, + config.environment.get(shlibpath_var, ''))) + config.environment[shlibpath_var] = shlibpath + break + else: + lit_config.warning("unable to inject shared library path on '{}'" + .format(platform.system())) # Build dotest command. dotest_cmd = [config.dotest_path, '-q'] |
