From 4499b294e4a53f71f8808d6eb55a7dd0b341cfb8 Mon Sep 17 00:00:00 2001
From: Andrey Mokhov <andrey.mokhov@gmail.com>
Date: Mon, 20 Nov 2017 22:51:40 +0000
Subject: [PATCH] Follow GHC changes (#479)
---
src/Rules/Program.hs | 3 ---
src/Settings/Warnings.hs | 2 --
2 files changed, 5 deletions(-)
diff --git a/src/Rules/Program.hs b/src/Rules/Program.hs
index ba4dab0442b..dca177f8798 100644
--- a/src/Rules/Program.hs
+++ b/src/Rules/Program.hs
@@ -92,7 +92,6 @@ buildWrapper context@Context {..} wrapper wrapperPath wrapped = do
putSuccess $ "| Successfully created wrapper for " ++
quote (pkgName package) ++ " (" ++ show stage ++ ")."
--- TODO: Get rid of the Paths_hsc2hs.o hack.
buildBinary :: [(Resource, Int)] -> FilePath -> Context -> Action ()
buildBinary rs bin context@Context {..} = do
binDeps <- if stage == Stage0 && package == ghcCabal
@@ -107,8 +106,6 @@ buildBinary rs bin context@Context {..} = do
cObjs <- mapM (objectPath context) cSrcs
hsObjs <- hsObjects context
return $ cObjs ++ hsObjs
- ++ [ path -/- "Paths_hsc2hs.o" | package == hsc2hs ]
- ++ [ path -/- "Paths_haddock.o" | package == haddock ]
need binDeps
buildWithResources rs $ target context (Ghc LinkHs stage) binDeps [bin]
synopsis <- traverse pkgSynopsis (pkgCabalFile package)
diff --git a/src/Settings/Warnings.hs b/src/Settings/Warnings.hs
index 8c42217e62b..abbc8142910 100644
--- a/src/Settings/Warnings.hs
+++ b/src/Settings/Warnings.hs
@@ -32,8 +32,6 @@ warningArgs = builder Ghc ? do
, package binary ? pure [ "-Wno-deprecations" ]
, package bytestring ? pure [ "-Wno-inline-rule-shadowing" ]
, package compiler ? pure [ "-Wcpp-undef" ]
- -- FIXME: See https://phabricator.haskell.org/D4121#117481.
- , input "//SysTools.hs" ? pure [ "-Wno-unused-imports" ]
, package directory ? pure [ "-Wno-unused-imports" ]
, package ghc ? pure [ "-Wcpp-undef" ]
, package ghcPrim ? pure [ "-Wno-trustworthy-safe" ]
--
GitLab