aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-10-06 14:48:46 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-10-06 14:48:46 -0700
commit3d563f34bb163ebcbee3380de76eceff72bda1ab (patch)
treeb6e4b5c30b17627b6f28278d2836bc950a3c56f7
parent1b81b2562f3913f2d4fda5bd3a002430b51e0de4 (diff)
move -DEMSCRIPTEN
-rw-r--r--tests/runner.py2
-rw-r--r--tools/shared.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index 0a1e2fba..da07b234 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -151,7 +151,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, '-emit-llvm'] + COMPILER_OPTS + COMPILER_TEST_OPTS +
['-I', dirname, '-I', os.path.join(dirname, 'include')] +
map(lambda include: '-I' + include, includes) +
['-c', f, '-o', f + '.o'],
diff --git a/tools/shared.py b/tools/shared.py
index ce2dff14..bd0e2191 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -29,7 +29,7 @@ EXEC_LLVM = path_from_root('tools', 'exec_llvm.py')
USE_EMSDK = True
-COMPILER_OPTS = COMPILER_OPTS + ['-m32', '-v', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87']
+COMPILER_OPTS = COMPILER_OPTS + ['-m32', '-v', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87', '-DEMSCRIPTEN']
if USE_EMSDK:
COMPILER_OPTS += [ '-nostdinc',