diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-09 03:18:51 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-09 03:18:51 +0200 |
| commit | 6495334b03bc527e2e576339bfee31bfbac50aec (patch) | |
| tree | 742b3c9520a178825189366625ee717cef2db214 | |
| parent | 8e9879a83c39a0085bb279570401418ae62a05eb (diff) | |
| download | meson-6495334b03bc527e2e576339bfee31bfbac50aec.zip meson-6495334b03bc527e2e576339bfee31bfbac50aec.tar.gz meson-6495334b03bc527e2e576339bfee31bfbac50aec.tar.bz2 | |
Fixed subproject compiler detection.
| -rw-r--r-- | build.py | 6 | ||||
| -rw-r--r-- | interpreter.py | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -44,11 +44,17 @@ class Build: def add_compiler(self, compiler): if len(self.compilers) == 0: self.static_linker = self.environment.detect_static_linker(compiler) + for i in self.compilers: + if i.get_language() == compiler.get_language(): + return self.compilers.append(compiler) def add_cross_compiler(self, compiler): if len(self.cross_compilers) == 0: self.static_cross_linker = self.environment.detect_static_linker(compiler) + for i in self.cross_compilers: + if i.get_language() == compiler.get_language(): + return self.cross_compilers.append(compiler) def get_project(self): diff --git a/interpreter.py b/interpreter.py index e1e4414..4e7dae9 100644 --- a/interpreter.py +++ b/interpreter.py @@ -718,7 +718,7 @@ class Interpreter(): raise InterpreterException('Argument languages must be a list of strings.') # TODO: check that elements are strings if len(self.build.pot) > 0: - raise InterpreterException('More than one gettext definitions currently not supported.') + raise InterpreterException('More than one gettext definition currently not supported.') self.build.pot.append((packagename, languages, self.subdir)) def func_option(self, nodes, args, kwargs): @@ -739,8 +739,10 @@ class Interpreter(): if not os.path.isdir(abs_subdir): raise InterpreterException('Subproject directory does not exist.') self.global_flags_frozen = True + mlog.log('\nExecuting subproject ', mlog.bold(dirname), '.\n', sep='') subi = Interpreter(self.build, subdir) subi.run() + mlog.log('\nSubproject finished.\n') self.subprojects[dirname] = SubprojectHolder(subi) return self.subprojects[dirname] |