aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-12-15 08:32:29 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-12-15 08:32:29 +0200
commit9553742cf67863e81e4ff053506ca9f87ced57e4 (patch)
tree9f9e1dba584ebf1132f35e20eaa0eabd659d3a96
parent6c769243ef185782ba1ae08ef2a9f4ded17f3949 (diff)
Fix bug in cxx install logic
-rw-r--r--build/cxx/link.cxx3
-rw-r--r--build/install/rule.cxx2
2 files changed, 3 insertions, 2 deletions
diff --git a/build/cxx/link.cxx b/build/cxx/link.cxx
index 9296035..81e6c0b 100644
--- a/build/cxx/link.cxx
+++ b/build/cxx/link.cxx
@@ -433,7 +433,8 @@ namespace build
// "library meta-information protocol". Don't do this if we are
// called from the install rule just to check if we would match.
//
- if (seen_lib && lt != type::e && a.operation () != install_id)
+ if (seen_lib && lt != type::e &&
+ a.operation () != install_id && a.outer_operation () != install_id)
{
if (t.group != nullptr)
t.group->prerequisite_targets.clear (); // lib{}'s
diff --git a/build/install/rule.cxx b/build/install/rule.cxx
index eb48bbe..854832c 100644
--- a/build/install/rule.cxx
+++ b/build/install/rule.cxx
@@ -181,7 +181,7 @@ namespace build
//
recipe d (match_delegate (a, t).first);
- // If we have no installable prerequsites, then simply redirect
+ // If we have no installable prerequisites, then simply redirect
// to it.
//
if (p.empty ())