aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libbuild2/cc/link-rule.cxx4
-rw-r--r--libbuild2/file-cache.cxx2
2 files changed, 6 insertions, 0 deletions
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 94e885f..a5fa7bc 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -995,11 +995,13 @@ namespace build2
// By default update ad hoc headers/sources during match (see
// above).
//
+#if 1
if (!um)
um = (p.is_a (x_src) ||
p.is_a<c> () ||
(x_mod != nullptr && p.is_a (*x_mod)) ||
x_header (p, true));
+#endif
if (*um)
{
@@ -1217,8 +1219,10 @@ namespace build2
{
// By default update headers during match (see above).
//
+#if 1
if (!um)
um = hdr;
+#endif
if (*um)
{
diff --git a/libbuild2/file-cache.cxx b/libbuild2/file-cache.cxx
index 1c1424f..caaf40c 100644
--- a/libbuild2/file-cache.cxx
+++ b/libbuild2/file-cache.cxx
@@ -28,6 +28,8 @@ namespace build2
if (!comp_path_.empty ())
try_rmfile_ignore_error (comp_path_);
+ // Note: state remains uninit until write::close().
+
pin ();
return write (*this);
}