Make the test rule depend on ghc-compact, to make this library's test…

…s pass (#677) This fixes all the failing ghc-compact tests (quite likely all of them, since they presumably all need the library), and also removes some leftover from the previous PR #676.
snowleopard · Sep 6, 2018 · f8d3f9b · f8d3f9b
1 parent 1bbc4b3
commit f8d3f9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
@@ -131,6 +131,7 @@ testsuitePackages = do
     return $ [ checkApiAnnotations
              , checkPpr
              , ghci
+             , ghcCompact
              , ghcPkg
              , hp2ps
              , hsc2hs

diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
@@ -26,15 +26,8 @@ packageArgs = do
 
           -- This fixes the 'unknown symbol stat' issue.
           -- See: https://github.com/snowleopard/hadrian/issues/259.
-          , builder (Ghc CompileCWithGhc) ? arg "-optc-O2"
+          , builder (Ghc CompileCWithGhc) ? arg "-optc-O2" ]
 
-          -- See https://ghc.haskell.org/trac/ghc/ticket/15286 and
-          -- https://phabricator.haskell.org/D4880
-          , builder (Ghc CompileHs) ? mconcat
-             [ input "//Natural.hs" ? pure ["-fno-omit-interface-pragmas"]
-             , input "//Num.hs" ? pure ["-fno-ignore-interface-pragmas"]
-             ]
-          ]
         ------------------------------ bytestring ------------------------------
         , package bytestring ?
           builder (Cabal Flags) ? intLib == integerSimple ? arg "integer-simple"