Made C++ work in Ninja.

2 files changed, 3 insertions, 5 deletions

diff --git a/environment.py b/environment.py
index 4e415ec..e63e3b3 100755
--- a/environment.py
+++ b/environment.py
@@ -86,7 +86,7 @@ class CCompiler():
 class CXXCompiler(CCompiler):
     def __init__(self, exelist):
         CCompiler.__init__(self, exelist)
-        self.language = 'c++'
+        self.language = 'cxx'
 
     def can_compile(self, filename):
         suffix = filename.split('.')[-1]
diff --git a/interpreter.py b/interpreter.py
index 1ff27bc..b749ad0 100755
--- a/interpreter.py
+++ b/interpreter.py
@@ -438,14 +438,12 @@ class Interpreter():
         for lang in args:
             if lang.lower() == 'c':
                 comp = self.environment.detect_c_compiler()
-                comp.sanity_check(self.environment.get_scratch_dir())
-                self.build.compilers.append(comp)
             elif lang.lower() == 'c++':
                 comp = self.environment.detect_cxx_compiler()
-                comp.sanity_check(self.environment.get_scratch_dir())
-                self.build.compilers.append(comp)
             else:
                 raise InvalidCode('Tried to use unknown language "%s".' % lang)
+            comp.sanity_check(self.environment.get_scratch_dir())
+            self.build.compilers.append(comp)
 
     def func_find_dep(self, node, args):
         self.validate_arguments(args, 1, [str])