Commit 4499b294 authored by Andrey Mokhov's avatar Andrey Mokhov Committed by GitHub

Follow GHC changes (#479)

parent 8fd68186
......@@ -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)
......
......@@ -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" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment