aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-09-24 18:21:58 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-09-24 18:21:58 -0700
commit2f11f2e15392069a3c4a72fef2358fbf722b4e0e (patch)
tree7aadb70939ccfa84575b44e0ee714d891666efc7 /tools
parentec318d92f2c5f645eab561efc461941405071131 (diff)
start to include system headers (tests broken)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/emmaken.py2
-rw-r--r--tools/shared.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/emmaken.py b/tools/emmaken.py
index cc98a01e..f906d958 100755
--- a/tools/emmaken.py
+++ b/tools/emmaken.py
@@ -89,7 +89,7 @@ try:
CC = CXX
CC_ARG_SKIP = ['-O1', '-O2', '-O3']
- CC_ADDITIONAL_ARGS = ['-m32', '-g', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87']
+ CC_ADDITIONAL_ARGS = COMPILER_OPTS # + ['-g']?
ALLOWED_LINK_ARGS = ['-f', '-help', '-o', '-print-after', '-print-after-all', '-print-before',
'-print-before-all', '-time-passes', '-v', '-verify-dom-info', '-version' ]
TWO_PART_DISALLOWED_LINK_ARGS = ['-L'] # Ignore thingsl like |-L .|
diff --git a/tools/shared.py b/tools/shared.py
index 029ca2f4..de1a4d7e 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -25,6 +25,10 @@ LLVM_COMPILER=os.path.expanduser(os.path.join(LLVM_ROOT, 'llc'))
BINDINGS_GENERATOR = path_from_root('tools', 'bindings_generator.py')
EXEC_LLVM = path_from_root('tools', 'exec_llvm.py')
+# Additional compiler options
+
+COMPILER_OPTS = COMPILER_OPTS + ['-m32', '-nostdinc', '-I' + path_from_root('system', 'include'), '-v', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87']
+
# Engine tweaks
#if 'strict' not in str(SPIDERMONKEY_ENGINE): # XXX temporarily disable strict mode until we sort out some stuff