llvm.org GIT mirror llvm / 8957f79
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 Alexey Samsonov 6 years ago
2 changed file(s) with 8 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all
8383
8484 # Setup paths to llvm-symbolizer for Sanitizer tools.
8585 llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
86 config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
87 config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
86 if llvm_tools_dir:
87 llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
88 config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
89 config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
6262 lit.fatal('No LLVM tools dir set!')
6363 path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
6464 config.environment['PATH'] = path
65 # Setup paths to llvm-symbolizer for Sanitizer tools.
66 llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
67 config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
68 config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
6569
6670 # Propagate 'HOME' through the environment.
6771 if 'HOME' in os.environ:
8892 # Propagate PYTHON_EXECUTABLE into the environment
8993 config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable',
9094 '')
91
92 # Setup paths to llvm-symbolizer for Sanitizer tools.
93 llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
94 config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
95 config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_tools_dir + '/llvm-symbolizer'
9695
9796 ###
9897