diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 14:29:43 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 14:29:43 -0700 |
| commit | d65c3474df9dd630fd1809f03a2650f6564cf963 (patch) | |
| tree | 36c58166e2d8603db564ca6df7e7ede0c58b5f0c | |
| parent | f75c7e0d0bb31871a5b1be45a35c5083508e7e83 (diff) | |
| parent | 475fb2c5b2be0f64858e764d660fe9addd71bcee (diff) | |
Merge pull request #1467 from abergmeier/extend_versions
Extend use of LLVM_ADD_VERSION and CLANG_ADD_VERSION
| -rw-r--r-- | tools/shared.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index b80d9389..f6d0ff4f 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -360,8 +360,15 @@ def check_sanity(force=False): # Tools/paths -LLVM_ADD_VERSION = os.getenv('LLVM_ADD_VERSION') -CLANG_ADD_VERSION = os.getenv('CLANG_ADD_VERSION') +try: + LLVM_ADD_VERSION +except NameError: + LLVM_ADD_VERSION = os.getenv('LLVM_ADD_VERSION') + +try: + CLANG_ADD_VERSION +except NameError: + CLANG_ADD_VERSION = os.getenv('CLANG_ADD_VERSION') # Some distributions ship with multiple llvm versions so they add # the version to the binaries, cope with that |