aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-01-05 11:32:10 -0800
committerAlon Zakai <alonzakai@gmail.com>2012-01-05 11:32:10 -0800
commit5ad5df53ba7dc0ce890acabed3388c6c2ca6077d (patch)
tree2c6941aa54b3eb36a0323a3edafb0be7d17927ad /tools
parent048cb329be8de531a7f427c95187fae1f86f24a7 (diff)
parent6b72b402328e0f4eb62bdd3bd8bde72d3cf7a464 (diff)
Merge pull request #162 from jterrace/incoming
Endianness, cross-compiling, and missing headers
Diffstat (limited to 'tools')
-rw-r--r--tools/shared.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 88f00b5f..ec33f6ab 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -81,7 +81,9 @@ def check_sanity(force=False):
# Tools/paths
-CLANG=os.path.expanduser(os.path.join(LLVM_ROOT, 'clang++'))
+CLANG_CC=os.path.expanduser(os.path.join(LLVM_ROOT, 'clang'))
+CLANG_CPP=os.path.expanduser(os.path.join(LLVM_ROOT, 'clang++'))
+CLANG=CLANG_CPP
LLVM_LINK=os.path.join(LLVM_ROOT, 'llvm-link')
LLVM_LD=os.path.join(LLVM_ROOT, 'llvm-ld')
LLVM_OPT=os.path.expanduser(os.path.join(LLVM_ROOT, 'opt'))
@@ -355,6 +357,10 @@ class Building:
env['EMMAKEN_COMPILER'] = Building.COMPILER
env['EMSCRIPTEN_TOOLS'] = path_from_root('tools')
env['CFLAGS'] = env['EMMAKEN_CFLAGS'] = ' '.join(COMPILER_OPTS + Building.COMPILER_TEST_OPTS) # Normal CFLAGS is ignored by some configure's.
+ env['HOST_CC'] = CLANG_CC
+ env['HOST_CXX'] = CLANG_CPP
+ env['HOST_CFLAGS'] = "-W" #if set to nothing, CFLAGS is used, which we don't want
+ env['HOST_CXXFLAGS'] = "-W" #if set to nothing, CXXFLAGS is used, which we don't want
return env
@staticmethod