[Git][ghc/ghc][wip/toolchain-selection] Use ghc-platform instead of ghc-boot

[Rodrigo Mesquita (@alt-romes)]

Rodrigo Mesquita pushed to branch wip/toolchain-selection at Glasgow Haskell Compiler / GHC


Commits:
35b3cc75 by Rodrigo Mesquita at 2023-06-27T16:08:53+01:00
Use ghc-platform instead of ghc-boot

- - - - -


5 changed files:

- hadrian/cabal.project
- hadrian/hadrian.cabal
- hadrian/stack.yaml
- m4/ghc_toolchain.m4
- utils/ghc-toolchain/ghc-toolchain.cabal


Changes:

=====================================
hadrian/cabal.project
=====================================
@@ -1,5 +1,6 @@
 packages: ./
           ../utils/ghc-toolchain/
+          ../libraries/ghc-platform/
 
 -- This essentially freezes the build plan for hadrian
 index-state: 2023-03-30T10:00:00Z


=====================================
hadrian/hadrian.cabal
=====================================
@@ -166,8 +166,8 @@ executable hadrian
                        , text                 >= 1.2     && < 3
                        , cryptohash-sha256    >= 0.11    && < 0.12
                        , base16-bytestring    >= 0.1.1 && < 1.1.0.0
+                       , ghc-platform
                        , ghc-toolchain
-                       , ghc-boot
     ghc-options:       -Wall
                        -Wincomplete-record-updates
                        -Wredundant-constraints


=====================================
hadrian/stack.yaml
=====================================
@@ -3,6 +3,7 @@ resolver: lts-19.8
 packages:
 - '.'
 - '../utils/ghc-toolchain'
+- '../libraries/ghc-platform'
 
 nix:
    enable: false


=====================================
m4/ghc_toolchain.m4
=====================================
@@ -22,7 +22,7 @@ AC_DEFUN([ENABLE_GHC_TOOLCHAIN_ARG],
 AC_DEFUN([FIND_GHC_TOOLCHAIN],
 [
     "$GHC" -v0 \
-        -ilibraries/ghc-boot -iutils/ghc-toolchain/src \
+        -ilibraries/ghc-platform/src -iutils/ghc-toolchain/src \
         -XNoImplicitPrelude \
         -odir actmp-ghc-toolchain -hidir actmp-ghc-toolchain \
         utils/ghc-toolchain/Main.hs -o acghc-toolchain


=====================================
utils/ghc-toolchain/ghc-toolchain.cabal
=====================================
@@ -36,8 +36,7 @@ library
                       filepath,
                       process,
                       transformers,
-                      async,
-                      ghc-boot
+                      ghc-platform
     hs-source-dirs:   src
     default-language: Haskell2010
 
@@ -50,6 +49,6 @@ executable ghc-toolchain
                       filepath,
                       process,
                       transformers,
-                      ghc-boot,
+                      ghc-platform,
                       ghc-toolchain
     default-language: Haskell2010



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/35b3cc75b726c94451ec7f61223e0d8df66f2388
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/20230627/a742de71/attachment-0001.html>