aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-06-26 19:18:28 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-06-26 19:18:28 -0700
commit9e7ca3ed20fe8302258cc7b4434e63d8282fd939 (patch)
tree4a04503d5d07ad312441a3f2816434ff3d21da23
parent1acf958b45e0500b93f70405f833b39cea72df82 (diff)
emit sanity file even in forced sanity checks, when it actually failed
-rw-r--r--tools/shared.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py
index e8570286..bca47ed1 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -324,6 +324,7 @@ def check_sanity(force=False):
if reason:
logging.warning('(Emscripten: %s, clearing cache)' % reason)
Cache.erase()
+ force = False # the check actually failed, so definitely write out the sanity file, to avoid others later seeing failures too
# some warning, not fatal checks - do them even if EM_IGNORE_SANITY is on
check_llvm_version()
@@ -944,7 +945,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
# Finish link
actual_files = unique_ordered(actual_files) # tolerate people trying to link a.so a.so etc.
- logging.debug('emcc: llvm-linking: %s', actual_files)
+ logging.debug('emcc: llvm-linking: %s to %s', actual_files, target)
# check for too-long command line
link_cmd = [LLVM_LINK] + actual_files + ['-o', target]