summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Mokhov <andrey.mokhov@gmail.com>2019-01-10 22:35:22 +0000
committerBen Gamari <ben@smart-cactus.org>2019-01-16 14:17:34 -0500
commitbfb3e3072d25d983e2245e2cf2d491981f49549c (patch)
tree82c7a1f9ccd63e9f265dd95b91d250516e1c9ae9
parent7218270dee1067db9c4f342b97e07ca89b80b82d (diff)
downloadhaskell-bfb3e3072d25d983e2245e2cf2d491981f49549c.tar.gz
Disable Shake Lint by default.
-rwxr-xr-xbuild.nix.sh1
-rw-r--r--hadrian/build.cabal.bat1
-rwxr-xr-xhadrian/build.cabal.sh1
-rw-r--r--hadrian/build.stack.bat2
-rwxr-xr-xhadrian/build.stack.sh1
-rw-r--r--hadrian/src/Rules/Gmp.hs7
6 files changed, 4 insertions, 9 deletions
diff --git a/build.nix.sh b/build.nix.sh
index 4b03ea8418..088202665f 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 b47c0bfe88..96f27251ca 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 9fddd61c4e..8c7b59492e 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 674375a3cf..642ab0639a 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 2b1ff1d059..2e6c444077 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 0194518d05..8e0d338c51 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"])