diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-22 16:46:38 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-22 16:46:38 +0200 |
| commit | bb6446f0c07877b5bea43cb74ec8babaff8a398d (patch) | |
| tree | c51ed788b4217789b4e4246c7c18424dc9c5fbe7 /backends.py | |
| parent | 3ed4cd98e40a64e2152891fea21adba749dfac19 (diff) | |
| download | meson-bb6446f0c07877b5bea43cb74ec8babaff8a398d.zip meson-bb6446f0c07877b5bea43cb74ec8babaff8a398d.tar.gz meson-bb6446f0c07877b5bea43cb74ec8babaff8a398d.tar.bz2 | |
Minor.
Diffstat (limited to 'backends.py')
| -rw-r--r-- | backends.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/backends.py b/backends.py index cc83776..5cf8c05 100644 --- a/backends.py +++ b/backends.py @@ -242,7 +242,7 @@ class Backend(): unity_src.append(abs_src) else: obj_list.append(self.generate_single_compile(target, outfile, src, False, header_deps)) - obj_list += self.flatten_obj_list(target) + obj_list += self.flatten_object_list(target) if is_unity: for src in self.generate_unity_files(target, unity_src): obj_list.append(self.generate_single_compile(target, outfile, src, True, unity_deps + header_deps)) @@ -938,9 +938,6 @@ class NinjaBackend(Backend): if len(infilelist) == len(outfilelist): sole_output = os.path.join(self.get_target_private_dir(target), outfilelist[i]) else: - for x in base_args: - if '@OUTPUT@' in x: - raise MesonException('Tried to use @OUTPUT@ in a rule with more than one output.') sole_output = '' curfile = infilelist[i] infilename = os.path.join(self.environment.get_source_dir(), curfile) |