Hadrian: ignore in-tree GMP objects with ``--lint``

2 files changed, 5 insertions, 4 deletions

diff --git a/hadrian/src/Main.hs b/hadrian/src/Main.hs
index 5bd7101180..36b1fd3cc1 100644
--- a/hadrian/src/Main.hs
+++ b/hadrian/src/Main.hs
@@ -65,6 +65,9 @@ main = do
                 -- Ignore access to autom4te.cache directories.
                 -- They are managed externally by auto tools.
                 , "//autom4te.cache/**"
+
+                -- Ignore in-tree GMP objects
+                , buildRoot -/- "**/gmp/objs/**"
                 ]
             }
 
diff --git a/hadrian/src/Rules/Gmp.hs b/hadrian/src/Rules/Gmp.hs
index 405c251b8b..3fe45d251f 100644
--- a/hadrian/src/Rules/Gmp.hs
+++ b/hadrian/src/Rules/Gmp.hs
@@ -22,12 +22,10 @@ gmpObjects s = do
       integerGmpPath <- buildPath ctx
       need [integerGmpPath -/- "include/ghc-gmp.h"]
 
-      -- The line below causes a Shake Lint failure on Windows, which forced
-      -- us to disable Lint by default (we don't track the object files of the
-      -- in-tree GMP library).
-      -- See more details here: https://gitlab.haskell.org/ghc/ghc/issues/15971.
       gmpPath <- gmpIntreePath s
       map (unifyPath . (gmpPath -/-)) <$>
+          -- Note we don't track the object files of the in-tree GMP library (cf
+          -- #15971).
           liftIO (getDirectoryFilesIO gmpPath [gmpObjectsDir -/- "*.o"])
 
 -- | Build directory for in-tree GMP library