remove hadrian extra cabal flags

shayne-fletcher · Jan 3, 2025 · 2c348af · 2c348af
1 parent 27e2421
commit 2c348af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/...workflows/ghc-lib-ghc-HEAD-ghc-9.10.1.yml → ...workflows/ghc-lib-ghc-HEAD-ghc-9.12.1.yml b/...workflows/ghc-lib-ghc-HEAD-ghc-9.10.1.yml → ...workflows/ghc-lib-ghc-HEAD-ghc-9.12.1.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Build (9.12.1)
 on:
   schedule: # run on master...
   - cron:  '0 0 * * *' # .... once a day at midnight
@@ -15,7 +15,7 @@ jobs:
       - uses: haskell-actions/setup@v2
         id: setup-haskell
         with:
-          ghc-version: 9.10.1
+          ghc-version: 9.12.1
           cabal-version: 'latest'
       - name: Install build tools (macOS)
         run: brew install automake

diff --git a/...rkflows/ghc-lib-ghc-master-ghc-9.10.1.yml → ...rkflows/ghc-lib-ghc-master-ghc-9.12.1.yml b/...rkflows/ghc-lib-ghc-master-ghc-9.10.1.yml → ...rkflows/ghc-lib-ghc-master-ghc-9.12.1.yml
@@ -1,4 +1,4 @@
-name: ghc-lib-ghc-master-ghc-9.10.1
+name: ghc-lib-ghc-master-ghc-9.12.1
 on:
   push:
   pull_request:
@@ -15,7 +15,7 @@ jobs:
       - uses: haskell-actions/setup@v2
         id: setup-haskell
         with:
-          ghc-version: 9.10.1
+          ghc-version: 9.12.1
           cabal-version: 'latest'
       - name: Install build tools (macOS)
         run: brew install automake

diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs
@@ -1567,20 +1567,12 @@ generatePrerequisites ghcFlavor = do
         =<< readFile' "./mk/get-win32-tarballs.sh"
     )
 
-  -- When there is a new GHC release it takes time for package bounds
-  -- to get updated.
-#if __GLASGOW_HASKELL__ == 912
-  let hadrianExtraCabalFlags = "--allow-newer "
-#else
-  let hadrianExtraCabalFlags = ""
-#endif
-
   system_ "bash -c ./boot"
   system_ "bash -c \"./configure --enable-tarballs-autodownload\""
   withCurrentDirectory "hadrian" $ do
-    system_ $ "cabal build " ++ hadrianExtraCabalFlags ++ "exe:hadrian --ghc-options=-j"
+    system_ $ "cabal build " ++ "exe:hadrian --ghc-options=-j"
     system_ . unwords . join $
-      [ [ "cabal run " ++ hadrianExtraCabalFlags ++ "exe:hadrian --",
+      [ [ "cabal run exe:hadrian --",
           "--directory=..",
           "--build-root=ghc-lib"
         ],