diff options
| author | Jeff Terrace <jterrace@gmail.com> | 2012-01-05 12:56:01 -0500 |
|---|---|---|
| committer | Jeff Terrace <jterrace@gmail.com> | 2012-01-05 12:56:01 -0500 |
| commit | 5581e9cec2f9716e77e83a273ed4e989202f8879 (patch) | |
| tree | 70acffb70c366907ef75637bf53a171aab669786 /tools/shared.py | |
| parent | 952db09871053e7a61ccc7f70ccf5cd738eb3f14 (diff) | |
| parent | a4c79c9ec14dfa52b2d299e0ef3ea952b7cbd5ee (diff) | |
Merge branch 'master' of git://github.com/jterrace/emscripten into incoming
Diffstat (limited to 'tools/shared.py')
| -rw-r--r-- | tools/shared.py | 8 |
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 |