aboutsummaryrefslogtreecommitdiff
path: root/tools/shared.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-07-17 18:02:49 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-07-17 18:02:49 -0700
commit83593bc18d53d66fb8407efb60ab3c1444d99005 (patch)
tree6a0cc4bd035b9943e95d91ac582d78fd251712fe /tools/shared.py
parent80e9d229d50b71b1a6bae9431e69cc511e1f28fd (diff)
check llvm version only when actually checking sanity - not on every call to emcc
Diffstat (limited to 'tools/shared.py')
-rw-r--r--tools/shared.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 4ab54273..3ddf6f47 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -62,12 +62,6 @@ def check_llvm_version():
# only when ${EM_CONFIG}_sanity does not exist or is older than EM_CONFIG (so,
# we re-check sanity when the settings are changed)
def check_sanity(force=False):
- check_llvm_version() # just a warning, not a fatal check - do it even if EM_IGNORE_SANITY is on
-
- if os.environ.get('EM_IGNORE_SANITY'):
- print >> sys.stderr, 'EM_IGNORE_SANITY set, ignoring sanity checks'
- return
-
try:
if not force:
if not CONFIG_FILE:
@@ -84,6 +78,12 @@ def check_sanity(force=False):
print >> sys.stderr, '(Emscripten: Config file changed, clearing cache)' # LLVM may have changed, etc.
Cache.erase()
+ check_llvm_version() # just a warning, not a fatal check - do it even if EM_IGNORE_SANITY is on
+
+ if os.environ.get('EM_IGNORE_SANITY'):
+ print >> sys.stderr, 'EM_IGNORE_SANITY set, ignoring sanity checks'
+ return
+
print >> sys.stderr, '(Emscripten: Running sanity checks)'
if not check_engine(COMPILER_ENGINE):