aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-06-17 07:19:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-06-17 07:19:15 +0200
commitb53318dcc9f2c34db0689225ec0bc2c70c28daf7 (patch)
tree09f9cb00a834f0423a4cc37d0db2ef196b07a1e3 /build
parentbbf5598f70f72ce7e2bd739c80fb70130ccd45f1 (diff)
Add libraries to "ok" prerequisites for synthesized object file targets
Diffstat (limited to 'build')
-rw-r--r--build/cxx/rule.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/build/cxx/rule.cxx b/build/cxx/rule.cxx
index 63fc4a5..9248777 100644
--- a/build/cxx/rule.cxx
+++ b/build/cxx/rule.cxx
@@ -789,13 +789,16 @@ namespace build
prerequisite* cp1 (nullptr);
for (prerequisite& p: reverse_iterate (group_prerequisites (*ot)))
{
- // Ignore some known target types (fsdir, headers).
+ // Ignore some known target types (fsdir, headers, libraries).
//
if (p.type.id == typeid (fsdir) ||
p.type.id == typeid (h) ||
(cp.type.id == typeid (cxx) && (p.type.id == typeid (hxx) ||
p.type.id == typeid (ixx) ||
- p.type.id == typeid (txx))))
+ p.type.id == typeid (txx))) ||
+ p.is_a<lib> () ||
+ p.is_a<liba> () ||
+ p.is_a<libso> ())
continue;
if (p.type.id == typeid (cxx))