aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-04-20 15:00:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-04-20 15:00:09 +0200
commitd882a627e0c1c90f49a2a1f69273aafc5ebfb520 (patch)
tree5f372aeceae522604e4a71d36b1f24c294755075
parentdfc49cdec02805adbe4dd6829b546a329bda48ff (diff)
Fix bug in recursively-binless detection logic
-rw-r--r--libbuild2/cc/link-rule.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 4f31103..c186751 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -1327,7 +1327,11 @@ namespace build2
}
else
{
- if (has_simple (find (x_libs)) || has_simple (find (c_libs)))
+ // These are strings and we assume if either is defined and
+ // not empty, then we have simple libraries.
+ //
+ if (((x = find (x_libs)) && !x->empty ()) ||
+ ((c = find (c_libs)) && !c->empty ()))
rec_binless = false;
}
}