diff options
author | Alon Zakai <alonzakai@gmail.com> | 2011-12-17 13:14:59 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-17 13:14:59 -0800 |
commit | 52f73412c5b077add97a2642a3876d721da9d77e (patch) | |
tree | 4f9a2adf90fda36fdba8d21ce2156382320f6a02 /emcc | |
parent | 0382c236cf9102abab29b68b37b0696a42ae3280 (diff) |
fix gcc/g++ selection logic in emcc when just configuring
Diffstat (limited to 'emcc')
-rwxr-xr-x | emcc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -161,10 +161,10 @@ CONFIGURE_CONFIG = os.environ.get('EMMAKEN_JUST_CONFIGURE') CMAKE_CONFIG = 'CMakeFiles/cmTryCompileExec.dir' in ' '.join(sys.argv)# or 'CMakeCCompilerId' in ' '.join(sys.argv) if CONFIGURE_CONFIG or CMAKE_CONFIG: compiler = shared.CLANG - if 'CXXCompiler' in ' '.join(sys.argv) or os.environ.get('EMMAKEN_CXX'): + if not ('CXXCompiler' in ' '.join(sys.argv) or os.environ.get('EMMAKEN_CXX')): compiler = shared.to_cc(compiler) cmd = [compiler] + shared.EMSDK_OPTS + sys.argv[1:] - if DEBUG: print >> sys.stderr, 'emcc, just configuring: ', cmd + if DEBUG: print >> sys.stderr, 'emcc, just configuring: ', compiler, cmd exit(os.execvp(compiler, cmd)) if os.environ.get('EMMAKEN_COMPILER'): |