forked from OSchip/llvm-project
Fixup for r176934. More careful setup of path to llvm-symbolizer
llvm-svn: 177145
This commit is contained in:
parent
cd27b98d38
commit
efb4168330
|
@ -87,5 +87,7 @@ if config.enable_shared:
|
|||
|
||||
# Setup paths to llvm-symbolizer for Sanitizer tools.
|
||||
llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
|
||||
config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
|
||||
config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
|
||||
if llvm_tools_dir:
|
||||
llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
|
||||
config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
|
||||
config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
|
||||
|
|
|
@ -83,6 +83,10 @@ if clang_obj_root is not None:
|
|||
lit.fatal('No LLVM tools dir set!')
|
||||
path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
|
||||
config.environment['PATH'] = path
|
||||
# Setup paths to llvm-symbolizer for Sanitizer tools.
|
||||
llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
|
||||
config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
|
||||
config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
|
||||
|
||||
llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
|
||||
if not llvm_libs_dir:
|
||||
|
@ -142,11 +146,6 @@ if config.test_exec_root is None:
|
|||
lit.load_config(config, site_cfg)
|
||||
raise SystemExit
|
||||
|
||||
# Setup paths to llvm-symbolizer for Sanitizer tools.
|
||||
llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
|
||||
config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
|
||||
config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
|
||||
|
||||
###
|
||||
|
||||
# Discover the 'clang' and 'clangcc' to use.
|
||||
|
|
Loading…
Reference in New Issue