diff options
| author | jpakkane <jpakkane@gmail.com> | 2014-10-29 10:25:53 +0200 |
|---|---|---|
| committer | jpakkane <jpakkane@gmail.com> | 2014-10-29 10:25:53 +0200 |
| commit | 38806249b73d1f9658029a20c3df5fd2578a43a2 (patch) | |
| tree | 87b0d6291f755776b87ff9fbd41d4c89c07bd1c1 | |
| parent | 751f03c55767d7d9f99f13253a653bb095e798a8 (diff) | |
| parent | d6a21792c3e6c82019946fa9f2347b7fbc4beda2 (diff) | |
| download | meson-38806249b73d1f9658029a20c3df5fd2578a43a2.zip meson-38806249b73d1f9658029a20c3df5fd2578a43a2.tar.gz meson-38806249b73d1f9658029a20c3df5fd2578a43a2.tar.bz2 | |
Merge pull request #15 from osimola/custom_object
Detect object files generated by custom targets and add them to the link.
| -rw-r--r-- | ninjabackend.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 9234c41..0918d7e 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -206,6 +206,8 @@ class NinjaBackend(backends.Backend): else: obj_list.append(self.generate_single_compile(target, outfile, RawFilename(src), True, header_deps)) + elif self.environment.is_object(src): + obj_list.append(src) else: # Assume anything not specifically a source file is a header. This is because # people generate files with weird suffixes (.inc, .fh) that they then include |