aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc/link-rule.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-12-03 14:33:25 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-12-03 14:33:25 +0200
commit864d84abcf1579b81f54d8d3f79520137d81f629 (patch)
tree574816959fec126b240075fdb304ad49e8142ab3 /libbuild2/cc/link-rule.cxx
parent08b69435ef6912abbca4b2830eac9e78776ef4d5 (diff)
Add ability to get absolute library paths from ${c,cxx}.lib_libs()
Diffstat (limited to 'libbuild2/cc/link-rule.cxx')
-rw-r--r--libbuild2/cc/link-rule.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 8175489..dea5879 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -1492,7 +1492,7 @@ namespace build2
append_libraries (appended_libraries& ls, strings& args,
const scope& bs, action a,
const file& l, bool la, lflags lf, linfo li,
- bool self) const
+ bool self, bool rel) const
{
struct data
{
@@ -1501,8 +1501,9 @@ namespace build2
const file& l;
action a;
linfo li;
+ bool rel;
compile_target_types tts;
- } d {ls, args, l, a, li, compile_types (li.type)};
+ } d {ls, args, l, a, li, rel, compile_types (li.type)};
auto imp = [] (const file&, bool la)
{
@@ -1637,7 +1638,9 @@ namespace build2
//
if (const file* f = pt->is_a<objx> ())
{
- string p (relative (f->path ()).string ());
+ const string& p (d.rel
+ ? relative (f->path ()).string ()
+ : f->path ().string ());
if (find (d.args.begin (), d.args.end (), p) == d.args.end ())
d.args.push_back (move (p));
}
@@ -1661,7 +1664,9 @@ namespace build2
l = li;
}
- string p (relative (l->path ()).string ());
+ string p (d.rel
+ ? relative (l->path ()).string ()
+ : l->path ().string ());
if (f & lflag_whole)
{