aboutsummaryrefslogtreecommitdiff
path: root/build2/cc/link.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-10-17 15:43:47 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-04 09:26:25 +0200
commitfc27ec48c9d63879e4b0f049060e943233cb540d (patch)
tree28e062c8674ad194268100bf48475aecaca4c056 /build2/cc/link.cxx
parent8b564b5b8f6d597a9fb76734e759f78c4b1c91da (diff)
Cleanup match_result mess
Diffstat (limited to 'build2/cc/link.cxx')
-rw-r--r--build2/cc/link.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index 5ab9d91..7722c4f 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -109,11 +109,11 @@ namespace build2
// it will most definitely need to be compiled but we can't do that.
//
else if (p.is_a<cc> ())
- return nullptr;
+ return false;
}
if (!(seen_x || seen_c || seen_obj || seen_lib))
- return nullptr;
+ return false;
// We will only chain a C source if there is also an X source or we were
// explicitly told to.
@@ -121,7 +121,7 @@ namespace build2
if (seen_c && !seen_x && hint < x)
{
l4 ([&]{trace << "C prerequisite without " << x_lang << " or hint";});
- return nullptr;
+ return false;
}
// Set the library type.
@@ -173,7 +173,7 @@ namespace build2
}
}
- return &t;
+ return true;
}
auto link::
@@ -316,7 +316,7 @@ namespace build2
}
recipe link::
- apply (action a, target& xt, const match_result&) const
+ apply (action a, target& xt) const
{
tracer trace (x, "link::apply");