diff options
| author | Afief Halumi <afief.h@gmail.com> | 2015-07-23 22:14:50 +0300 |
|---|---|---|
| committer | Afief Halumi <afief.h@gmail.com> | 2015-07-23 22:17:39 +0300 |
| commit | 5148972bfe5f4d2012ec29cf913ec8cf5eafd47e (patch) | |
| tree | a9d55f25791da690d3d1e440a720815a1e42dda8 /ninjabackend.py | |
| parent | cbc37237974d3b9de31acca91fa9207f462c9b4d (diff) | |
| download | meson-5148972bfe5f4d2012ec29cf913ec8cf5eafd47e.zip meson-5148972bfe5f4d2012ec29cf913ec8cf5eafd47e.tar.gz meson-5148972bfe5f4d2012ec29cf913ec8cf5eafd47e.tar.bz2 | |
Avoid sorting object list before generating target
When adding objects to a build target (specifically static libraries)
they should appear at the end of the object list. Sorting the list always
put them at the beginning of the list.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index e3bb90c..9f8175c 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -77,8 +77,6 @@ class NinjaBuildElement(): self.elems.append((name, elems)) def write(self, outfile): - # Sort inputs so the command line does not change. - # This allows Ninja to skip unnecessary rebuilds. line = 'build %s: %s %s' % (' '.join([ninja_quote(i) for i in self.outfilenames]),\ self.rule, ' '.join([ninja_quote(i) for i in self.infilenames])) @@ -259,8 +257,7 @@ class NinjaBackend(backends.Backend): 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)) linker = self.determine_linker(target, src_list) - # Sort object list to preserve command line over multiple invocations. - elem = self.generate_link(target, outfile, outname, sorted(obj_list), linker, pch_objects) + elem = self.generate_link(target, outfile, outname, obj_list, linker, pch_objects) self.generate_shlib_aliases(target, self.get_target_dir(target), outfile, elem) self.processed_targets[name] = True |