From f8d3f9b09ec1596b7cf7349e3ec8508352d6e3e4 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Thu, 6 Sep 2018 15:31:34 +0200
Subject: [PATCH] Make the test rule depend on ghc-compact, to make this
 library's tests 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.
---
 src/Settings/Default.hs  | 1 +
 src/Settings/Packages.hs | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
index 839c0333be..b3828fa8b5 100644
--- 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
index 2dbb8269e8..97e272b522 100644
--- 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"