[Git][ghc/ghc][master] Hadrian: ignore in-tree GMP objects with ``--lint``

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
faa36e5b by Sylvain Henry at 2020-03-21T00:43:41Z
Hadrian: ignore in-tree GMP objects with ``--lint``

- - - - -


2 changed files:

- hadrian/src/Main.hs
- hadrian/src/Rules/Gmp.hs


Changes:

=====================================
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/**"
                 ]
             }
 


=====================================
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



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/faa36e5b3674a7b2cfc6b931eec27b3558fad33b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/faa36e5b3674a7b2cfc6b931eec27b3558fad33b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200320/b2eacb71/attachment-0001.html>