From 4aa72b9934a1bd58bccdc8ee8f376637f3507b71 Mon Sep 17 00:00:00 2001 From: Shayne Fletcher Date: Fri, 20 Dec 2024 14:24:44 -0500 Subject: [PATCH] ghc_bignum and ghc_internal are merginge (#576) --- CI.hs | 2 +- ghc-lib-gen/src/Ghclibgen.hs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CI.hs b/CI.hs index 43135f51..ed95e1cb 100755 --- a/CI.hs +++ b/CI.hs @@ -100,7 +100,7 @@ data DaFlavor = DaFlavor -- Last tested gitlab.haskell.org/ghc/ghc.git at current :: String -current = "bfacc086604c18e30758772a05a8c81e3a4e01bc" -- 2024-12-16 +current = "8b266671bcfe9ef5a25f0a78ea7dcca68b78dc32" -- 2024-12-19 ghcFlavorOpt :: GhcFlavor -> String ghcFlavorOpt = \case diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs index 46272db4..0f59452a 100644 --- a/ghc-lib-gen/src/Ghclibgen.hs +++ b/ghc-lib-gen/src/Ghclibgen.hs @@ -321,6 +321,7 @@ calcModuleDeps includeDirs _hsSrcDirs hsSrcIncludes ghcFlavor cabalPackageDb ghc ["-clear-package-db -global-package-db -user-package-db -package-db " ++ cabalPackageDb], ["-package semaphore-compat" | series >= GHC_9_8], ["-fno-safe-haskell" | series >= GHC_9_0], -- avoid warning: [GHC-98887] -XGeneralizedNewtypeDeriving is not allowed in Safe Haskell; ignoring -XGeneralizedNewtypeDeriving + ["-DBIGNUM_NATIVE" | series > GHC_9_12], includeDirs, hsSrcIncludes, [placeholderModulesDir "Main.hs"]