diff options
| -rwxr-xr-x | emscripten.py | 2 | ||||
| -rw-r--r-- | settings.py | 4 | ||||
| -rw-r--r-- | tests/runner.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/emscripten.py b/emscripten.py index 21abcc1d..40a09904 100755 --- a/emscripten.py +++ b/emscripten.py @@ -101,7 +101,7 @@ def compile_malloc(): """ src = path_from_root('src', 'dlmalloc.c') includes = '-I' + path_from_root('src', 'include') - command = [shared.CLANG, '-c', '-g', '-emit-llvm', '-m32', '-o-', includes, src] + command = [shared.CLANG, '-c', '-g', '-emit-llvm', '-m32'] + shared.COMPILER_OPTS + ['-o-', includes, src] with get_temp_file('.bc') as out: ret = subprocess.call(command, stdout=out) if ret != 0: raise RuntimeError('Could not compile dlmalloc.') return out.name diff --git a/settings.py b/settings.py index fe9297f7..ab9619a9 100644 --- a/settings.py +++ b/settings.py @@ -7,9 +7,7 @@ TEMP_DIR='/dev/shm' LLVM_ROOT=os.path.expanduser('~/Dev/llvm-2.9/cbuild/bin') -COMPILER_OPTS = ['-m32'] # Need to build as 32bit arch, for now - - # various errors on 64bit compilation - # WARNING: '-g' here will generate llvm bitcode that lli will crash on! +COMPILER_OPTS = [] SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n'] V8_ENGINE = [os.path.expanduser('~/Dev/v8/d8')] diff --git a/tests/runner.py b/tests/runner.py index f7ae9b06..11f3c804 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -154,7 +154,7 @@ class RunnerCore(unittest.TestCase): os.remove(f + '.o.ll') except: pass - output = Popen([COMPILER, '-DEMSCRIPTEN', '-emit-llvm'] + COMPILER_OPTS + COMPILER_TEST_OPTS + + output = Popen([COMPILER, '-DEMSCRIPTEN', '-emit-llvm', '-m32'] + COMPILER_OPTS + COMPILER_TEST_OPTS + ['-I', dirname, '-I', os.path.join(dirname, 'include')] + map(lambda include: '-I' + include, includes) + ['-c', f, '-o', f + '.o'], |