diff options
| author | jpakkane <jpakkane@gmail.com> | 2015-05-23 20:02:33 +0300 |
|---|---|---|
| committer | jpakkane <jpakkane@gmail.com> | 2015-05-23 20:02:33 +0300 |
| commit | 478a01e01a2b6137a707b0fb1f1a7d00f185a562 (patch) | |
| tree | 24899cafe18c934b4cd9de9bdd58e17ddc56cacf | |
| parent | 23700b7e4bc437a553d30b36d96c853acb8b6965 (diff) | |
| parent | dbc5df06efe75000572d8aad3cf63767b3e34e5a (diff) | |
| download | meson-478a01e01a2b6137a707b0fb1f1a7d00f185a562.zip meson-478a01e01a2b6137a707b0fb1f1a7d00f185a562.tar.gz meson-478a01e01a2b6137a707b0fb1f1a7d00f185a562.tar.bz2 | |
Merge pull request #131 from ignatenkobrain/wip/rpm
modules/rpm: add compiler deps for gcc, gcc-c++
| -rw-r--r-- | modules/rpm.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/rpm.py b/modules/rpm.py index 01c50ce..eebecdd 100644 --- a/modules/rpm.py +++ b/modules/rpm.py @@ -27,7 +27,11 @@ 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') @@ -35,9 +39,6 @@ class RPMModule: 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())) |