aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-03-15 10:20:01 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-03-15 10:20:01 -0700
commit4f81862d24677494d350735a9826f0fe4d53d94e (patch)
tree9529eca8dfa898bc273a63c809982038f2e381bb
parent42d004d7f1f5baf8e34e7b927648e083c10a2fe7 (diff)
add conftest.c workaround in emcc
-rwxr-xr-xemcc2
1 files changed, 1 insertions, 1 deletions
diff --git a/emcc b/emcc
index f23777b9..5617a093 100755
--- a/emcc
+++ b/emcc
@@ -243,7 +243,7 @@ the source of emcc (search for 'os.environ').
# If this is a configure-type thing, do not compile to JavaScript, instead use clang
# to compile to a native binary (using our headers, so things make sense later)
-CONFIGURE_CONFIG = os.environ.get('EMMAKEN_JUST_CONFIGURE')
+CONFIGURE_CONFIG = os.environ.get('EMMAKEN_JUST_CONFIGURE') or 'conftest.c' in sys.argv
CMAKE_CONFIG = 'CMakeFiles/cmTryCompileExec.dir' in ' '.join(sys.argv)# or 'CMakeCCompilerId' in ' '.join(sys.argv)
if CONFIGURE_CONFIG or CMAKE_CONFIG:
compiler = shared.CLANG