diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-05-02 15:31:52 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-05-02 15:31:52 -0700 |
| commit | 6b5e7e290190ea604d9f3761d8f7e13781cea36a (patch) | |
| tree | 2a169fd33664c4f52ed2abdcb2ff696d42db7830 /tools | |
| parent | 961554b0266c8f18a4889284668cea28217699aa (diff) | |
check sanity later in test runner, so we can know env settings, and do not needless tear down le32 stuff
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index 25c17688..3f695142 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -203,7 +203,7 @@ def check_node_version(): EMSCRIPTEN_VERSION = '1.4.1' def generate_sanity(): - return EMSCRIPTEN_VERSION + '|' + LLVM_TARGET + return EMSCRIPTEN_VERSION + '|' + get_llvm_target() def check_sanity(force=False): try: @@ -400,7 +400,9 @@ except: # Additional compiler options # Target choice. Must be synced with src/settings.js (TARGET_*) -LLVM_TARGET = os.environ.get('EMCC_LLVM_TARGET') or 'i386-pc-linux-gnu' # 'le32-unknown-nacl' +def get_llvm_target(): + return os.environ.get('EMCC_LLVM_TARGET') or 'i386-pc-linux-gnu' # 'le32-unknown-nacl' +LLVM_TARGET = get_llvm_target() try: COMPILER_OPTS # Can be set in EM_CONFIG, optionally |