Skip to content
Snippets Groups Projects
Commit bfb3e307 authored by Andrey Mokhov's avatar Andrey Mokhov Committed by Ben Gamari
Browse files

Disable Shake Lint by default.

parent 7218270d
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,5 @@ echo $absoluteRoot ...@@ -30,6 +30,5 @@ echo $absoluteRoot
cd "$absoluteRoot" cd "$absoluteRoot"
hadrian \ hadrian \
--lint \
--directory="$absoluteRoot/.." \ --directory="$absoluteRoot/.." \
"$@" "$@"
...@@ -32,7 +32,6 @@ if %CABMAJOR% equ 2 ( ...@@ -32,7 +32,6 @@ if %CABMAJOR% equ 2 (
if %_cabal_ok% equ 1 ( if %_cabal_ok% equ 1 (
"%CABAL%" --project-file=%PROJ% new-build %CABFLAGS% -j exe:hadrian "%CABAL%" --project-file=%PROJ% new-build %CABFLAGS% -j exe:hadrian
"%CABAL%" --project-file=%PROJ% new-run %CABFLAGS% exe:hadrian -- ^ "%CABAL%" --project-file=%PROJ% new-run %CABFLAGS% exe:hadrian -- ^
--lint ^
--directory "%CD%" ^ --directory "%CD%" ^
%* %*
) else ( ) else (
......
...@@ -25,7 +25,6 @@ if [ "${CABVER[0]}" -gt 2 -o "${CABVER[0]}" -eq 2 -a "${CABVER[1]}" -ge 2 ]; ...@@ -25,7 +25,6 @@ if [ "${CABVER[0]}" -gt 2 -o "${CABVER[0]}" -eq 2 -a "${CABVER[1]}" -ge 2 ];
then then
"$CABAL" --project-file="$PROJ" new-build $CABFLAGS -j exe:hadrian "$CABAL" --project-file="$PROJ" new-build $CABFLAGS -j exe:hadrian
"$CABAL" --project-file="$PROJ" new-run $CABFLAGS exe:hadrian -- \ "$CABAL" --project-file="$PROJ" new-run $CABFLAGS exe:hadrian -- \
--lint \
--directory "$PWD" \ --directory "$PWD" \
"$@" "$@"
else else
......
...@@ -8,4 +8,4 @@ stack build ...@@ -8,4 +8,4 @@ stack build
if %errorlevel% neq 0 exit /B %errorlevel% if %errorlevel% neq 0 exit /B %errorlevel%
rem Run Hadrian in GHC top directory forwarding additional user arguments rem Run Hadrian in GHC top directory forwarding additional user arguments
stack exec hadrian -- --lint --directory ".." %* stack exec hadrian -- --directory ".." %*
...@@ -34,6 +34,5 @@ cd "$absoluteRoot" ...@@ -34,6 +34,5 @@ cd "$absoluteRoot"
stack build --no-library-profiling ${HADRIAN_NIX:+--nix} stack build --no-library-profiling ${HADRIAN_NIX:+--nix}
stack exec hadrian -- \ stack exec hadrian -- \
--lint \
--directory "$absoluteRoot/.." \ --directory "$absoluteRoot/.." \
"$@" "$@"
...@@ -14,10 +14,9 @@ gmpObjects :: Action [FilePath] ...@@ -14,10 +14,9 @@ gmpObjects :: Action [FilePath]
gmpObjects = do gmpObjects = do
gmpPath <- gmpBuildPath gmpPath <- gmpBuildPath
need [gmpPath -/- gmpLibraryH] need [gmpPath -/- gmpLibraryH]
-- We need to use the untracked version of 'getDirectoryFiles', because the -- The line below causes a Shake Lint failure on Windows, which forced us to
-- contents of 'gmpObjectsDir' is built by Hadrian (in 'gmpRules'). Using -- disable Lint by default. See more details here:
-- the tracked version can lead to Shake Lint failure. -- https://ghc.haskell.org/trac/ghc/ticket/15971.
-- See: https://ghc.haskell.org/trac/ghc/ticket/15971.
map unifyPath <$> map unifyPath <$>
liftIO (getDirectoryFilesIO "" [gmpPath -/- gmpObjectsDir -/- "*.o"]) liftIO (getDirectoryFilesIO "" [gmpPath -/- gmpObjectsDir -/- "*.o"])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment