[commit: ghc] wip/T15971: Disable Shake Lint by default. (bc3dd0b)

git at git.haskell.org git at git.haskell.org
Thu Jan 10 22:36:56 UTC 2019


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T15971
Link       : http://ghc.haskell.org/trac/ghc/changeset/bc3dd0b45e2a5a73bf4c95eac9164a0fc7bded73/ghc

>---------------------------------------------------------------

commit bc3dd0b45e2a5a73bf4c95eac9164a0fc7bded73
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jan 10 22:35:22 2019 +0000

    Disable Shake Lint by default.


>---------------------------------------------------------------

bc3dd0b45e2a5a73bf4c95eac9164a0fc7bded73
 build.nix.sh             | 1 -
 hadrian/build.cabal.bat  | 1 -
 hadrian/build.cabal.sh   | 1 -
 hadrian/build.stack.bat  | 2 +-
 hadrian/build.stack.sh   | 1 -
 hadrian/src/Rules/Gmp.hs | 7 +++----
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/build.nix.sh b/build.nix.sh
index 4b03ea8..0882026 100755
--- a/build.nix.sh
+++ b/build.nix.sh
@@ -30,6 +30,5 @@ echo $absoluteRoot
 cd "$absoluteRoot"
 
 hadrian         \
-  --lint                         \
   --directory="$absoluteRoot/.." \
   "$@"
diff --git a/hadrian/build.cabal.bat b/hadrian/build.cabal.bat
index b47c0bf..96f2725 100644
--- a/hadrian/build.cabal.bat
+++ b/hadrian/build.cabal.bat
@@ -32,7 +32,6 @@ if %CABMAJOR% equ 2 (
 if %_cabal_ok% equ 1 (
     "%CABAL%" --project-file=%PROJ% new-build %CABFLAGS% -j exe:hadrian
     "%CABAL%" --project-file=%PROJ% new-run   %CABFLAGS%    exe:hadrian -- ^
-        --lint ^
         --directory "%CD%" ^
         %*
 ) else (
diff --git a/hadrian/build.cabal.sh b/hadrian/build.cabal.sh
index 9fddd61..8c7b594 100755
--- a/hadrian/build.cabal.sh
+++ b/hadrian/build.cabal.sh
@@ -25,7 +25,6 @@ if [ "${CABVER[0]}" -gt 2 -o "${CABVER[0]}" -eq 2 -a "${CABVER[1]}" -ge 2 ];
 then
     "$CABAL" --project-file="$PROJ" new-build $CABFLAGS -j exe:hadrian
     "$CABAL" --project-file="$PROJ" new-run   $CABFLAGS    exe:hadrian -- \
-        --lint             \
         --directory "$PWD" \
         "$@"
 else
diff --git a/hadrian/build.stack.bat b/hadrian/build.stack.bat
index 674375a..642ab06 100644
--- a/hadrian/build.stack.bat
+++ b/hadrian/build.stack.bat
@@ -8,4 +8,4 @@ stack build
 if %errorlevel% neq 0 exit /B %errorlevel%
 
 rem Run Hadrian in GHC top directory forwarding additional user arguments
-stack exec hadrian -- --lint --directory ".." %*
+stack exec hadrian -- --directory ".." %*
diff --git a/hadrian/build.stack.sh b/hadrian/build.stack.sh
index 2b1ff1d..2e6c444 100755
--- a/hadrian/build.stack.sh
+++ b/hadrian/build.stack.sh
@@ -34,6 +34,5 @@ cd "$absoluteRoot"
 stack build --no-library-profiling ${HADRIAN_NIX:+--nix}
 
 stack exec hadrian --              \
-    --lint                         \
     --directory "$absoluteRoot/.." \
     "$@"
diff --git a/hadrian/src/Rules/Gmp.hs b/hadrian/src/Rules/Gmp.hs
index 0194518..8e0d338 100644
--- a/hadrian/src/Rules/Gmp.hs
+++ b/hadrian/src/Rules/Gmp.hs
@@ -14,10 +14,9 @@ gmpObjects :: Action [FilePath]
 gmpObjects = do
     gmpPath <- gmpBuildPath
     need [gmpPath -/- gmpLibraryH]
-    -- We need to use the untracked version of 'getDirectoryFiles', because the
-    -- contents of 'gmpObjectsDir' is built by Hadrian (in 'gmpRules'). Using
-    -- the tracked version can lead to Shake Lint failure.
-    -- See: https://ghc.haskell.org/trac/ghc/ticket/15971.
+    -- The line below causes a Shake Lint failure on Windows, which forced us to
+    -- disable Lint by default. See more details here:
+    -- https://ghc.haskell.org/trac/ghc/ticket/15971.
     map unifyPath <$>
         liftIO (getDirectoryFilesIO "" [gmpPath -/- gmpObjectsDir -/- "*.o"])
 



More information about the ghc-commits mailing list