6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-19 04:32:19 +00:00
Code Issues Projects Releases Wiki Activity

lit: PR21417: don't try to update OCAMLPATH if LibDir is empty.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220919 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Zotov 2014-10-30 19:26:42 +00:00
parent 496bd0b8a5
commit a8111668bb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/lit.cfg
View File

@ -101,12 +101,14 @@ for options in ['ASAN_OPTIONS', 'UBSAN_OPTIONS']:
config.environment[options] = os.environ[options]
# Set up OCAMLPATH to include newly built OCaml libraries.
llvm_ocaml_lib = os.path.join(getattr(config, 'llvm_lib_dir', None), 'ocaml')
if 'OCAMLPATH' in os.environ:
ocamlpath = os.path.pathsep.join((llvm_ocaml_lib, os.environ['OCAMLPATH']))
config.environment['OCAMLPATH'] = ocamlpath
else:
config.environment['OCAMLPATH'] = llvm_ocaml_lib
llvm_lib_dir = getattr(config, 'llvm_lib_dir', None)
if llvm_lib_dir: # empty llvm_lib_dir is falsey, reads as None
llvm_ocaml_lib = os.path.join(llvm_lib_dir, 'ocaml')
if 'OCAMLPATH' in os.environ:
ocamlpath = os.path.pathsep.join((llvm_ocaml_lib, os.environ['OCAMLPATH']))
config.environment['OCAMLPATH'] = ocamlpath
else:
config.environment['OCAMLPATH'] = llvm_ocaml_lib
# Set up OCAMLRUNPARAM to enable backtraces in OCaml tests.
config.environment['OCAMLRUNPARAM'] = 'b'