From bcdb84fcbe31b9dff686794b1cabaff0e95a5e91 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Tue, 5 Nov 2013 00:16:17 +0200
Subject: Can use object files directly in targets.

---
 backends.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'backends.py')

diff --git a/backends.py b/backends.py
index 01e782cd6..989b65883 100644
--- a/backends.py
+++ b/backends.py
@@ -171,6 +171,12 @@ class Backend():
         for src in target.get_sources():
             if not self.environment.is_header(src):
                 obj_list.append(self.generate_single_compile(target, outfile, src, False, header_deps))
+        for obj in target.get_objects():
+            if isinstance(obj, str):
+                o = os.path.join(self.build_to_src, target.get_subdir(), obj)
+            else:
+                raise MesonException('Unknown data type in object list.')
+            obj_list.append(o)
         elem = self.generate_link(target, outfile, outname, obj_list)
         self.generate_shlib_aliases(target, self.get_target_dir(target), outfile, elem)
         self.processed_targets[name] = True
-- 
cgit v1.2.3