diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-01 13:41:39 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-01 13:41:39 +0200 |
| commit | e4f3abce80e80789eafa05bcd5802a0a7015fcd0 (patch) | |
| tree | 12b7d144289103ba2c86ed73c07913b97d483d9d | |
| parent | 8c4614233ee448f842e195cd41abd900b235dc3d (diff) | |
Fix bug in *.export.imp_libs logic
| -rw-r--r-- | libbuild2/cc/common.cxx | 4 | ||||
| -rw-r--r-- | libbuild2/cc/pkgconfig.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx index bf592cd..e11dea2 100644 --- a/libbuild2/cc/common.cxx +++ b/libbuild2/cc/common.cxx @@ -427,9 +427,9 @@ namespace build2 // /tmp/libfoo/lib{foo} or ../libfoo/lib{foo}) or a project-qualified // relative target name (e.g., libfoo%lib{foo}). // - // Note that in case of the relative target that comes from export.libs, + // Note that in case of the relative target that comes from export.*libs, // the resolution happens relative to the base scope of the target from - // which this export.libs came, which is exactly what we want. + // which this export.*libs came, which is exactly what we want. // // Note that the scope, search paths, and the link order should all be // derived from the library target that mentioned this name. This way we diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx index 7fd07dc..35948de 100644 --- a/libbuild2/cc/pkgconfig.cxx +++ b/libbuild2/cc/pkgconfig.cxx @@ -1068,7 +1068,7 @@ namespace build2 // Set even if empty (export override). // { - auto p (t.vars.insert (c_export_libs)); + auto p (t.vars.insert (la ? c_export_imp_libs : c_export_libs)); if (p.second) p.first.get () = move (libs); |