Merge pull request #131 from ignatenkobrain/wip/rpm

modules/rpm: add compiler deps for gcc, gcc-c++
mesonbuild · May 23, 2015 · 478a01e · 478a01e
2 parents 23700b7 + dbc5df0
commit 478a01e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/modules/rpm.py b/modules/rpm.py
@@ -27,17 +27,18 @@ class RPMModule:
     def generate_spec_template(self, state, args, kwargs):
         compiler_deps = set()
         for compiler in state.compilers:
-            if isinstance(compiler, compilers.ValaCompiler):
+            if isinstance(compiler, compilers.GnuCCompiler):
+                compiler_deps.add('gcc')
+            elif isinstance(compiler, compilers.GnuCPPCompiler):
+                compiler_deps.add('gcc-c++')
+            elif isinstance(compiler, compilers.ValaCompiler):
                 compiler_deps.add('vala')
             elif isinstance(compiler, compilers.GnuFortranCompiler):
                 compiler_deps.add('gcc-gfortran')
             elif isinstance(compiler, compilers.GnuObjCCompiler):
                 compiler_deps.add('gcc-objc')
             elif compiler == compilers.GnuObjCPPCompiler:
                 compiler_deps.add('gcc-objc++')
-            elif isinstance(compiler, (compilers.GnuCCompiler, compilers.GnuCPPCompiler)):
-                # Installed by default
-                pass
             else:
                 mlog.log('RPM spec file will not created, generating not allowed for:',
                          mlog.bold(compiler.get_id()))