[Git][ghc/ghc][wip/hadrian-cross-stage2] 14 commits: fail when bindist configure fails

Matthew Pickering (@mpickering) gitlab at gitlab.haskell.org
Thu Dec 14 10:38:47 UTC 2023



Matthew Pickering pushed to branch wip/hadrian-cross-stage2 at Glasgow Haskell Compiler / GHC


Commits:
9eec0e8d by Matthew Pickering at 2023-12-14T10:35:58+00:00
fail when bindist configure fails

- - - - -
c980f9be by Matthew Pickering at 2023-12-14T10:35:58+00:00
Correctly propagate build/host/target to bindist

fix host/target bindist
t

- - - - -
5d304d5f by Matthew Pickering at 2023-12-14T10:35:58+00:00
ci: Test cross bindists

- - - - -
c3ec8dc1 by Matthew Pickering at 2023-12-14T10:35:58+00:00
CROSS_STAGE variable

- - - - -
1088a7a9 by Matthew Pickering at 2023-12-14T10:35:58+00:00
Use explicit syntax rather than pure

- - - - -
9a997c17 by Matthew Pickering at 2023-12-14T10:35:58+00:00
ci: Javascript don't set CROSS_EMULATOR

There is no CROSS_EMULATOR needed to run javascript binaries, so we
don't set the CROSS_EMULATOR to some dummy value.

- - - - -
86b55939 by Matthew Pickering at 2023-12-14T10:35:58+00:00
hadrian: Fill in more of the default.host toolchain file

When you are building a cross compiler this file will be used to build
stage1 and it's libraries, so we need enough information here to work
accurately. There is still more work to be done (see for example, word
size is still fixed).

- - - - -
d7849d75 by Matthew Pickering at 2023-12-14T10:38:32+00:00
hadrian: Build stage 2 cross compilers

* Most of hadrian is abstracted over the stage in order to remove the
  assumption that the target of all stages is the same platform. This
  allows the RTS to be built for two different targets for example.
* Abstracts the bindist creation logic to allow building either normal
  or cross bindists. Normal bindists use stage 1 libraries and a stage 2
  compiler. Cross bindists use stage 2 libararies and a stage 2
  compiler.

-------------------------
Metric Decrease:
    T10421a
    T10858
    T11195
    T11276
    T11374
    T11822
    T15630
    T17096
    T18478
    T20261
Metric Increase:
    parsing001
-------------------------

- - - - -
1a0aadb6 by GHC GitLab CI at 2023-12-14T10:38:33+00:00
fix

- - - - -
1173f884 by GHC GitLab CI at 2023-12-14T10:38:33+00:00
Build genapply per stage

- - - - -
0d967e3c by GHC GitLab CI at 2023-12-14T10:38:33+00:00
Correct GHC_PKG path

- - - - -
a3e3a86e by GHC GitLab CI at 2023-12-14T10:38:33+00:00
Don't build genapply for javascript backend

- - - - -
9c1b30a4 by Matthew Pickering at 2023-12-14T10:38:33+00:00
hadrian: Make binary-dist-dir the default build target

This allows us to have the logic in one place about which
libraries/stages to build with cross compilers.

- - - - -
c4212be0 by Matthew Pickering at 2023-12-14T10:38:33+00:00
Fix exe path

- - - - -


30 changed files:

- .gitlab/ci.sh
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
- configure.ac
- distrib/configure.ac.in
- hadrian/bindist/Makefile
- hadrian/bindist/config.mk.in
- hadrian/cfg/default.host.target.in
- hadrian/src/Builder.hs
- hadrian/src/Context.hs
- hadrian/src/Expression.hs
- hadrian/src/Flavour.hs
- hadrian/src/Flavour/Type.hs
- hadrian/src/Hadrian/Expression.hs
- hadrian/src/Hadrian/Haskell/Hash.hs
- hadrian/src/Hadrian/Oracles/TextFile.hs
- hadrian/src/Oracles/Flag.hs
- hadrian/src/Oracles/Flavour.hs
- hadrian/src/Oracles/Setting.hs
- hadrian/src/Oracles/TestSettings.hs
- hadrian/src/Packages.hs
- hadrian/src/Rules.hs
- hadrian/src/Rules/BinaryDist.hs
- hadrian/src/Rules/CabalReinstall.hs
- hadrian/src/Rules/Compile.hs
- hadrian/src/Rules/Documentation.hs
- hadrian/src/Rules/Generate.hs
- hadrian/src/Rules/Gmp.hs
- hadrian/src/Rules/Libffi.hs
- hadrian/src/Rules/Library.hs


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/73096b5919ff473191576cf30c0e6209df101dd6...c4212be0c107b8a7c6eed558959a2882c353f337

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/73096b5919ff473191576cf30c0e6209df101dd6...c4212be0c107b8a7c6eed558959a2882c353f337
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/20231214/6b4ff7d2/attachment.html>


More information about the ghc-commits mailing list