diff options
Diffstat (limited to 'tools/shared.py')
| -rw-r--r-- | tools/shared.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/shared.py b/tools/shared.py index 533906c9..1adbdfaa 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') @@ -707,13 +709,14 @@ else: # Engine tweaks try: + SPIDERMONKEY_ENGINE = listify(SPIDERMONKEY_ENGINE) if 'gcparam' not in str(SPIDERMONKEY_ENGINE): new_spidermonkey = SPIDERMONKEY_ENGINE - if type(SPIDERMONKEY_ENGINE) is str: - new_spidermonkey = [SPIDERMONKEY_ENGINE] new_spidermonkey += ['-e', "gcparam('maxBytes', 1024*1024*1024);"] # Our very large files need lots of gc heap JS_ENGINES = map(lambda x: x if x != SPIDERMONKEY_ENGINE else new_spidermonkey, JS_ENGINES) SPIDERMONKEY_ENGINE = new_spidermonkey + if '-w' not in SPIDERMONKEY_ENGINE: + SPIDERMONKEY_ENGINE += ['-w'] except NameError: pass |