aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-10-01 11:44:18 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-10-01 11:44:18 -0700
commit8c53160d51aaed62f609058e5f991524c89a3e0a (patch)
treef5b767e83214b8026d105600e28324fc3d6ce7de /emcc
parent5a7de50f0089421508e3bd94bfda21e661135d37 (diff)
CONFIGURE_CC option to let you define the compiler used when configure-ing
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc2
1 files changed, 1 insertions, 1 deletions
diff --git a/emcc b/emcc
index 1dc9b756..4a821591 100755
--- a/emcc
+++ b/emcc
@@ -367,7 +367,7 @@ def is_minus_s_for_emcc(newargs,i):
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
+ compiler = os.environ.get('CONFIGURE_CC') or shared.CLANG # if CONFIGURE_CC is defined, use that. let's you use local gcc etc. if you need that
if not ('CXXCompiler' in ' '.join(sys.argv) or os.environ.get('EMMAKEN_CXX')):
compiler = shared.to_cc(compiler)
def filter_emscripten_options(argv):