From 08fc27af4731a1cab4f82cfdedbf1dfb5f6fd563 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 12 Oct 2023 11:11:45 -0400
Subject: [PATCH] Do not substitute `@...@` for stage-specific values in cabal
files
`rts` and `ghc-prim` now no longer have a `*.cabal.in` to set Cabal flag
defaults; instead manual choices are passed to configure in the usual
way.
The old way was fundamentally broken, because it meant we were baking
these Cabal files for a specific stage. Now we only do stage-agnostic
@...@ substitution in cabal files (the GHC version), and so all
stage-specific configuration is properly confined to `_build` and the
right stage dir.
Also `include-ghc-prim` is a flag that no longer exists for `ghc-prim`
(it was removed in 835d8ddbbfb11796ea8a03d1806b7cee38ba17a6) so I got
rid of it.
Co-Authored-By: Matthew Pickering <matthewtpickering@gmail.com>
---
.gitignore | 1 -
hadrian/src/Rules/Generate.hs | 38 -------------------
hadrian/src/Settings/Packages.hs | 13 ++++++-
.../{ghc-prim.cabal.in => ghc-prim.cabal} | 2 +-
rts/.gitignore | 2 -
rts/{rts.cabal.in => rts.cabal} | 26 ++++++-------
6 files changed, 26 insertions(+), 56 deletions(-)
rename libraries/ghc-prim/{ghc-prim.cabal.in => ghc-prim.cabal} (99%)
rename rts/{rts.cabal.in => rts.cabal} (98%)
diff --git a/.gitignore b/.gitignore
index 5a8d0c4124d4..39bf855af36a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,7 +167,6 @@ _darcs/
/libraries/ghc-boot-th/ghc-boot-th.cabal
/libraries/ghc-boot-th/ghc.mk
/libraries/ghc-heap/ghc-heap.cabal
-/libraries/ghc-prim/ghc-prim.cabal
/libraries/ghci/GNUmakefile
/libraries/ghci/ghci.cabal
/libraries/ghci/ghc.mk
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs
index d774fd9b6ac2..7a3046381aa6 100644
--- a/hadrian/src/Rules/Generate.hs
+++ b/hadrian/src/Rules/Generate.hs
@@ -268,17 +268,6 @@ runInterpolations (Interpolations mk_substs) input = do
subst = foldr (.) id [replace ("@"++k++"@") v | (k,v) <- substs]
return (subst input)
-toCabalBool :: Bool -> String
-toCabalBool True = "True"
-toCabalBool False = "False"
-
--- | Interpolate the given variable with the value of the given 'Flag', using
--- Cabal's boolean syntax.
-interpolateCabalFlag :: String -> Flag -> Interpolations
-interpolateCabalFlag name flg = interpolateVar name $ do
- val <- flag flg
- return (toCabalBool val)
-
-- | Interpolate the given variable with the value of the given 'Setting'.
interpolateSetting :: String -> Setting -> Interpolations
interpolateSetting name settng = interpolateVar name $ setting settng
@@ -290,31 +279,6 @@ projectVersion = mconcat
, interpolateSetting "ProjectVersionMunged" ProjectVersionMunged
]
-rtsCabalFlags :: Interpolations
-rtsCabalFlags = mconcat
- [ flag "CabalHaveLibdw" UseLibdw
- , flag "CabalHaveLibm" UseLibm
- , flag "CabalHaveLibrt" UseLibrt
- , flag "CabalHaveLibdl" UseLibdl
- , flag "CabalNeedLibpthread" UseLibpthread
- , flag "CabalHaveLibbfd" UseLibbfd
- , flag "CabalHaveLibNuma" UseLibnuma
- , flag "CabalHaveLibZstd" UseLibzstd
- , flag "CabalStaticLibZstd" StaticLibzstd
- , flag "CabalNeedLibatomic" NeedLibatomic
- , flag "CabalUseSystemLibFFI" UseSystemFfi
- , targetFlag "CabalLibffiAdjustors" tgtUseLibffiForAdjustors
- , targetFlag "CabalLeadingUnderscore" tgtSymbolsHaveLeadingUnderscore
- ]
- where
- flag = interpolateCabalFlag
- targetFlag name q = interpolateVar name $ do
- val <- queryTargetTarget q
- return (toCabalBool val)
-
-ghcPrimCabalFlags :: Interpolations
-ghcPrimCabalFlags = interpolateCabalFlag "CabalNeedLibatomic" NeedLibatomic
-
packageVersions :: Interpolations
packageVersions = foldMap f [ base, ghcPrim, compiler, ghc, cabal, templateHaskell, ghcCompact, array ]
where
@@ -347,8 +311,6 @@ templateRule outPath interps = do
templateRules :: Rules ()
templateRules = do
templateRule "compiler/ghc.cabal" $ projectVersion
- templateRule "rts/rts.cabal" $ rtsCabalFlags
- templateRule "libraries/ghc-prim/ghc-prim.cabal" $ ghcPrimCabalFlags
templateRule "driver/ghci/ghci-wrapper.cabal" $ projectVersion
templateRule "ghc/ghc-bin.cabal" $ projectVersion
templateRule "utils/iserv/iserv.cabal" $ projectVersion
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs
index 9959df6170bb..1bc52a243899 100644
--- a/hadrian/src/Settings/Packages.hs
+++ b/hadrian/src/Settings/Packages.hs
@@ -114,7 +114,7 @@ packageArgs = do
-------------------------------- ghcPrim -------------------------------
, package ghcPrim ? mconcat
- [ builder (Cabal Flags) ? arg "include-ghc-prim"
+ [ builder (Cabal Flags) ? flag NeedLibatomic `cabalFlag` "need-atomic"
, builder (Cc CompileC) ? (not <$> flag CcLlvmBackend) ?
input "**/cbits/atomic.c" ? arg "-Wno-sync-nand" ]
@@ -401,8 +401,19 @@ rtsPackageArgs = package rts ? do
, any (wayUnit Debug) rtsWays `cabalFlag` "debug"
, any (wayUnit Dynamic) rtsWays `cabalFlag` "dynamic"
, any (wayUnit Threaded) rtsWays `cabalFlag` "threaded"
+ , flag UseLibm `cabalFlag` "libm"
+ , flag UseLibrt `cabalFlag` "librt"
+ , flag UseLibdl `cabalFlag` "libdl"
, useSystemFfi `cabalFlag` "use-system-libffi"
, useLibffiForAdjustors `cabalFlag` "libffi-adjustors"
+ , flag UseLibpthread `cabalFlag` "need-pthread"
+ , flag UseLibbfd `cabalFlag` "libbfd"
+ , flag NeedLibatomic `cabalFlag` "need-atomic"
+ , flag UseLibdw `cabalFlag` "libdw"
+ , flag UseLibnuma `cabalFlag` "libnuma"
+ , flag UseLibzstd `cabalFlag` "libzstd"
+ , flag StaticLibzstd `cabalFlag` "static-libzstd"
+ , queryTargetTarget tgtSymbolsHaveLeadingUnderscore `cabalFlag` "leading-underscore"
, Debug `wayUnit` way `cabalFlag` "find-ptr"
]
, builder (Cabal Setup) ? mconcat
diff --git a/libraries/ghc-prim/ghc-prim.cabal.in b/libraries/ghc-prim/ghc-prim.cabal
similarity index 99%
rename from libraries/ghc-prim/ghc-prim.cabal.in
rename to libraries/ghc-prim/ghc-prim.cabal
index 004ab2ee6613..345d91265c79 100644
--- a/libraries/ghc-prim/ghc-prim.cabal.in
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -28,7 +28,7 @@ custom-setup
setup-depends: base >= 4 && < 5, process, filepath, directory, Cabal >= 1.23 && < 3.9
flag need-atomic
- default: @CabalNeedLibatomic@
+ default: False
Library
default-language: Haskell2010
diff --git a/rts/.gitignore b/rts/.gitignore
index 657baa7c1785..179d62d55cf7 100644
--- a/rts/.gitignore
+++ b/rts/.gitignore
@@ -2,8 +2,6 @@
/dist/
/dist-*/
-/rts.cabal
-
/include/ghcversion.h
/package.conf.inplace
diff --git a/rts/rts.cabal.in b/rts/rts.cabal
similarity index 98%
rename from rts/rts.cabal.in
rename to rts/rts.cabal
index 2ae39793256e..73b39bd7ca32 100644
--- a/rts/rts.cabal.in
+++ b/rts/rts.cabal
@@ -29,31 +29,31 @@ source-repository head
subdir: rts
flag libm
- default: @CabalHaveLibm@
+ default: False
flag librt
- default: @CabalHaveLibrt@
+ default: False
flag libdl
- default: @CabalHaveLibdl@
+ default: False
flag use-system-libffi
- default: @CabalUseSystemLibFFI@
+ default: False
flag libffi-adjustors
- default: @CabalLibffiAdjustors@
+ default: False
flag need-pthread
- default: @CabalNeedLibpthread@
+ default: False
flag libbfd
- default: @CabalHaveLibbfd@
+ default: False
flag need-atomic
- default: @CabalNeedLibatomic@
+ default: False
flag libdw
- default: @CabalHaveLibdw@
+ default: False
flag libnuma
- default: @CabalHaveLibNuma@
+ default: False
flag libzstd
- default: @CabalHaveLibZstd@
+ default: False
flag static-libzstd
- default: @CabalStaticLibZstd@
+ default: False
flag leading-underscore
- default: @CabalLeadingUnderscore@
+ default: False
flag smp
default: True
flag find-ptr
--
GitLab