diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-10-01 11:44:18 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-10-01 11:44:18 -0700 |
commit | 8c53160d51aaed62f609058e5f991524c89a3e0a (patch) | |
tree | f5b767e83214b8026d105600e28324fc3d6ce7de | |
parent | 5a7de50f0089421508e3bd94bfda21e661135d37 (diff) |
CONFIGURE_CC option to let you define the compiler used when configure-ing
-rwxr-xr-x | emcc | 2 | ||||
-rwxr-xr-x | emconfigure | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -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): diff --git a/emconfigure b/emconfigure index e68aaa54..64ca8c4f 100755 --- a/emconfigure +++ b/emconfigure @@ -10,6 +10,10 @@ You can also use this for cmake and other configure-like stages. What happens is that all compilations done during this command are to native code, not JS, so that configure tests will work properly. + +Relevant defines: + + CONFIGURE_CC - see emcc ''' import os, sys |