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

Fixup for r176933: more careful setup of path to llvm-symbolizer 

llvm-svn: 177144
This commit is contained in:
Alexey Samsonov 2013-03-15 07:27:49 +00:00
parent 337b0fcf9c
commit cd27b98d38
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/test/Unit/lit.cfg
View File

@ -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

9
llvm/test/lit.cfg
View File

@ -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