mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-17 00:50:58 +00:00
Fixup for r176933: more careful setup of path to llvm-symbolizer
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@177144 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
d455d4f457
commit
8957f7996c
@ -84,5 +84,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
|
||||
|
@ -63,6 +63,10 @@ if llvm_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
|
||||
|
||||
# Propagate 'HOME' through the environment.
|
||||
if 'HOME' in os.environ:
|
||||
@ -90,11 +94,6 @@ config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '')
|
||||
config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable',
|
||||
'')
|
||||
|
||||
# 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'
|
||||
|
||||
###
|
||||
|
||||
import os
|
||||
|
Loading…
Reference in New Issue
Block a user