emmakenxx.py to handle .c files in projects that are really c++

tools/emmaken.py

@@ -24,7 +24,7 @@
  * With CMake, do something like
 
     SET(CMAKE_C_COMPILER "PATH/emmaken.py")
-    SET(CMAKE_CXX_COMPILER "PATH/emmaken.py")
+    SET(CMAKE_CXX_COMPILER "PATH/emmakenxx.py")
     SET(CMAKE_LINKER "PATH/emmaken.py")
     SET(CMAKE_CXX_LINKER "PATH/emmaken.py")
     SET(CMAKE_C_LINK_EXECUTABLE "PATH/emmaken.py")
@@ -37,6 +37,15 @@
 give to Emscripten. Note that this tool doesn't run Emscripten itself. Note
 also that you may need to do some manual fiddling later, for example to
 link files that weren't linked, and them llvm-dis them.
+
+Note the appearance of emmakenxx.py instead of emmaken.py
+for the C++ compiler. This is needed for cases where we get
+a C++ file with a C extension, in which case CMake can be told
+to run g++ on it despite the .c extension, see
+
+  /~https://github.com/kripken/emscripten/issues/6
+
+(If a similar situation occurs with ./configure, you can do the same there too.)
 '''
 
 import sys
@@ -65,6 +74,11 @@ def path_from_root(*pathelems):
   CXX = os.environ.get('EMMAKEN_COMPILER') or LLVM_GCC
   CC = to_cc(CXX)
 
+  # If we got here from a redirection through emmakenxx.py, then force a C++ compiler here
+  if sys.argv[-1] == '-EMMAKEN_CXX':
+    CC = CXX
+    sys.argv = sys.argv[:-1]
+
   CC_ARG_SKIP = ['-O1', '-O2', '-O3']
   CC_ADDITIONAL_ARGS = ['-m32', '-U__i386__', '-U__x86_64__', '-U__SSE__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87']
   ALLOWED_LINK_ARGS = ['-f', '-help', '-o', '-print-after', '-print-after-all', '-print-before',

tools/emmakenxx.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+'''
+see emmaken.py
+'''
+
+import os, sys
+
+abspath = os.path.abspath(os.path.dirname(__file__))
+def path_from_root(*pathelems):
+  return os.path.join(os.path.sep, *(abspath.split(os.sep)[:-1] + list(pathelems)))
+exec(open(path_from_root('tools', 'shared.py'), 'r').read())
+
+emmaken = path_from_root('tools', 'emmaken.py')
+exit(os.execvp('python', ['python', emmaken] + sys.argv[1:] + ['-EMMAKEN_CXX']))
+