diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2014-03-04 19:22:04 +0200 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2014-03-05 19:11:48 +0200 |
| commit | e0f312c385f6227cf4b3a8517ab45a47498957d0 (patch) | |
| tree | 3363883b28cb7232266460d30bb7d522f15442db /tools | |
| parent | a7f7be88de0d636489e46053928bc5b608b8f958 (diff) | |
If the directory tree for used LLVM compiler is not from a LLVM source checkout and clang_version is not found, assume clang_version = llvm_version.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py index 533906c9..8a27e966 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -316,8 +316,10 @@ def check_fastcomp(): llvm_version = open(os.path.join(d, 'emscripten-version.txt')).read().strip() if os.path.exists(os.path.join(d, 'tools', 'clang', 'emscripten-version.txt')): clang_version = open(os.path.join(d, 'tools', 'clang', 'emscripten-version.txt')).read().strip() + elif os.path.exists(os.path.join(d, 'tools', 'clang')): + clang_version = '?' # Looks like the LLVM compiler tree has an old checkout from the time before it contained a version.txt: Should update! else: - clang_version = '?' + clang_version = llvm_version # This LLVM compiler tree does not have a tools/clang, so it's probably an out-of-source build directory. No need for separate versioning. if EMSCRIPTEN_VERSION != llvm_version or EMSCRIPTEN_VERSION != clang_version: logging.error('Emscripten, llvm and clang versions do not match, this is dangerous (%s, %s, %s)', EMSCRIPTEN_VERSION, llvm_version, clang_version) logging.error('Make sure to use the same branch in each repo, and to be up-to-date on each. See https://github.com/kripken/emscripten/wiki/LLVM-Backend') |