aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-02-26 17:58:26 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-02-26 17:58:26 -0800
commit2a43c14b8458f4e5c4e7ee5b8e28d52be5f472bb (patch)
treed29810ab00f0974d419d5b8a2a6c1c423a12d9ab /tools
parent024adc2a7a7fe07b4c7436eed072646734e741f5 (diff)
more warnings on source versions not matching, plus testing
Diffstat (limited to 'tools')
-rw-r--r--tools/shared.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/shared.py b/tools/shared.py
index f2f90398..ac6319bf 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -307,9 +307,11 @@ def check_fastcomp():
return False
# look for a source tree under the llvm binary directory. if there is one, look for emscripten-version.txt files
+ seen = False
d = os.path.dirname(LLVM_COMPILER)
while d != os.path.dirname(d):
if os.path.exists(os.path.join(d, 'emscripten-version.txt')):
+ seen = True
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()
@@ -320,6 +322,8 @@ def check_fastcomp():
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')
break
d = os.path.dirname(d)
+ if not seen:
+ logging.warning('did not see a source tree above LLVM_DIR, could not verify version numbers match')
return True
except Exception, e:
logging.warning('could not check fastcomp: %s' % str(e))