aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-01-05 20:54:42 -0800
committerAlon Zakai <alonzakai@gmail.com>2012-01-05 20:54:42 -0800
commitb97c0cc2585a6617b8f170c2d8583e4c69f3f50d (patch)
tree85e040c1c61175f3b58c0cd317eb74ffd11edbb2 /tools
parentc35586c36c8ac7aaf1c934862555976ca0f04c89 (diff)
do not add compiler opts to CFLAGS, we add them in emcc anyhow (which is safer)
Diffstat (limited to 'tools')
-rw-r--r--tools/shared.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py
index ec33f6ab..3d22c353 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -344,7 +344,7 @@ Settings.reset()
class Building:
COMPILER = CLANG
LLVM_OPTS = False
- COMPILER_TEST_OPTS = []
+ COMPILER_TEST_OPTS = [] # For use of the test runner
@staticmethod
def get_building_env():
@@ -356,7 +356,7 @@ class Building:
env['LIBTOOL'] = EMLIBTOOL
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['CFLAGS'] = env['EMMAKEN_CFLAGS'] = ' '.join(Building.COMPILER_TEST_OPTS)
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