aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/bin/utility.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-12-11 07:20:18 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-12-11 07:20:18 +0200
commit4cf87fa84a6938e262fd6122e654e5a483a78abe (patch)
tree9d6a7802d156dc287562f77184396e0cc7b62d23 /libbuild2/bin/utility.cxx
parent3074c5e1409ad49c0793db6384ecbc6ac4ed33a9 (diff)
Add support for module interface-only libraries
Also suppress generation of the object file in cases where we don't need it.
Diffstat (limited to 'libbuild2/bin/utility.cxx')
-rw-r--r--libbuild2/bin/utility.cxx16
1 files changed, 10 insertions, 6 deletions
diff --git a/libbuild2/bin/utility.cxx b/libbuild2/bin/utility.cxx
index 6b0c4de..11230cd 100644
--- a/libbuild2/bin/utility.cxx
+++ b/libbuild2/bin/utility.cxx
@@ -47,9 +47,11 @@ namespace build2
return lmembers {a, s};
}
- const target*
+ const file*
link_member (const libx& x, action a, linfo li, bool exist)
{
+ const target* r;
+
if (x.is_a<libul> ())
{
// For libul{} that is linked to an executable the member choice
@@ -72,7 +74,7 @@ namespace build2
// Called by the compile rule during execute.
//
- return x.ctx.phase == run_phase::match && !exist
+ r = x.ctx.phase == run_phase::match && !exist
? &search (x, tt, x.dir, x.out, x.name)
: search_existing (x.ctx, tt, x.dir, x.out, x.name);
}
@@ -87,15 +89,17 @@ namespace build2
group_view gv (resolve_members (a, l));
assert (gv.members != nullptr);
- pair<otype, bool> r (
+ pair<otype, bool> p (
link_member (lmembers {l.a != nullptr, l.s != nullptr}, li.order));
- if (!r.second)
- fail << (r.first == otype::s ? "shared" : "static")
+ if (!p.second)
+ fail << (p.first == otype::s ? "shared" : "static")
<< " variant of " << l << " is not available";
- return r.first == otype::s ? static_cast<const target*> (l.s) : l.a;
+ r = p.first == otype::s ? static_cast<const target*> (l.s) : l.a;
}
+
+ return static_cast<const file*> (r);
}
pattern_paths