From 70d63c266ffd313c03f6cf68e7080bbcd3c8c064 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 15 Feb 2024 09:11:53 +0200
Subject: Add fsdir{} duplicate suppression in more places

---
 libbuild2/cc/compile-rule.cxx | 3 ++-
 libbuild2/cc/link-rule.cxx    | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index 5c811a1..d490c8e 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -1085,7 +1085,8 @@ namespace build2
         {
           pt = &p.search (t);
 
-          if (a.operation () == clean_id && !pt->dir.sub (rs.out_path ()))
+          if (pt == dir ||
+              (a.operation () == clean_id && !pt->dir.sub (rs.out_path ())))
             continue;
         }
 
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 76e4a25..d705eb5 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -912,7 +912,7 @@ namespace build2
       // for binless libraries since there could be other output (e.g., .pc
       // files).
       //
-      inject_fsdir (a, t);
+      const fsdir* dir (inject_fsdir (a, t));
 
       // Process prerequisites, pass 1: search and match prerequisite
       // libraries, search obj/bmi{} targets, and search targets we do rule
@@ -1201,6 +1201,12 @@ namespace build2
             }
 
             pt = &p.search (t);
+
+            if (pt == dir)
+            {
+              pt = nullptr;
+              continue;
+            }
           }
 
           if (skip (*pt))
-- 
cgit v1.1