[Git][ghc/ghc][wip/T23536-teo] Apply 3 suggestion(s) to 3 file(s)

[Teo Camarasu (@teo)]

Teo Camarasu pushed to branch wip/T23536-teo at Glasgow Haskell Compiler / GHC


Commits:
f749da0e by Matthew Craven at 2024-04-11T13:21:16+00:00
Apply 3 suggestion(s) to 3 file(s)
- - - - -


3 changed files:

- compiler/GHC/Tc/Gen/Splice.hs
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/template-haskell/template-haskell.cabal.in


Changes:

=====================================
compiler/GHC/Tc/Gen/Splice.hs
=====================================
@@ -2966,8 +2966,14 @@ tcGetInterp = do
 --           because the boot compiler expects the boot TH AST in splices, but, e.g.,
 --           splice functions in GHC.Core.Map.TH would return the in-tree TH AST.
 --           However, at the moment, we are not using TH in GHC anyway.)
---        * Ultimately, we must link the stage1 compiler against a single version
---          of template-haskell.
+--        * Ultimately, we must link the stage1 compiler against a
+--          single version of template-haskell.
+--            (Beyond the fact that doing otherwise would invite even
+--            more "which `template-haskell` is this" confusion, it
+--            would also result in confusing linker errors: see for
+--            example #21981.  In principle we could likely lift this
+--            restriction with more aggressive name mangling, but the
+--            knock-on effects of doing so are unexplored.)
 --        * If the single version is the in-tree TH, we have to recompile all boot
 --          libraries (e.g. bytestring, containers) with this new TH version.
 --        * But the boot libraries must *not* be built against a non-boot TH version.


=====================================
libraries/ghc-boot/ghc-boot.cabal.in
=====================================
@@ -38,8 +38,8 @@ source-repository head
 Flag bootstrap
         Description:
           Enabled when building the stage1 compiler in order to vendor the in-tree
-          `template-haskell` library, while allowing dependencies to depend on the
-          boot `template-haskell` library.
+          `template-haskell` library (including its dependency `ghc-boot-th`), while
+          allowing dependencies to depend on the boot `template-haskell` library.
           See Note [Bootstrapping Template Haskell]
         Default: False
         Manual: True


=====================================
libraries/template-haskell/template-haskell.cabal.in
=====================================
@@ -1,5 +1,5 @@
--- WARNING: template-haskell at Suffix@.cabal is automatically generated from template-haskell at Suffix@.cabal.in by
--- ../../configure.  Make sure you are editing template-haskell at Suffix@.cabal.in, not
+-- WARNING: template-haskell at Suffix@.cabal is automatically generated from ../template-haskell/template-haskell.cabal.in by
+-- ../../configure.  Make sure you are editing template-haskell.cabal.in, not
 -- template-haskell at Suffix@.cabal.
 
 name:           template-haskell at Suffix@



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f749da0e1be25fa97447d93c61982decf0300932

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f749da0e1be25fa97447d93c61982decf0300932
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240411/172df3e2/attachment-0001.html>