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

Fixup for r176934. More careful setup of path to llvm-symbolizer 

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

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

@ -87,5 +87,7 @@ if config.enable_shared:
# Setup paths to llvm-symbolizer for Sanitizer tools. # Setup paths to llvm-symbolizer for Sanitizer tools.
llvm_tools_dir = getattr(config, 'llvm_tools_dir', None) llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer' if llvm_tools_dir:
config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer' 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
clang/test/lit.cfg
View File

@ -83,6 +83,10 @@ if clang_obj_root is not None:
lit.fatal('No LLVM tools dir set!') lit.fatal('No LLVM tools dir set!')
path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH'])) path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
config.environment['PATH'] = 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) llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
if not llvm_libs_dir: if not llvm_libs_dir:
@ -142,11 +146,6 @@ if config.test_exec_root is None:
lit.load_config(config, site_cfg) lit.load_config(config, site_cfg)
raise SystemExit 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. # Discover the 'clang' and 'clangcc' to use.