[Git][ghc/ghc][wip/hadrian-cross-stage2] 17 commits: hadrian: Build all executables in bin/ folder

Matthew Pickering (@mpickering) gitlab at gitlab.haskell.org
Thu Dec 21 17:53:53 UTC 2023



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


Commits:
f7e21fab by Matthew Pickering at 2023-12-21T14:57:40+00:00
hadrian: Build all executables in bin/ folder

In the end the bindist creation logic copies them all into the bin
folder. There is no benefit to building a specific few binaries in the
lib/bin folder anymore.

This also removes the ad-hoc logic to copy the touchy and unlit
executables from stage0 into stage1. It takes <1s to build so we might
as well just build it.

- - - - -
1cb16b39 by Matthew Pickering at 2023-12-21T17:31:39+00:00
fail when bindist configure fails

- - - - -
d170ef16 by Matthew Pickering at 2023-12-21T17:31:39+00:00
Correctly propagate build/host/target to bindist

fix host/target bindist
t

- - - - -
56b8bd12 by Matthew Pickering at 2023-12-21T17:31:39+00:00
ci: Test cross bindists

- - - - -
d7ae7e38 by Matthew Pickering at 2023-12-21T17:31:39+00:00
CROSS_STAGE variable

- - - - -
c6781beb by Matthew Pickering at 2023-12-21T17:31:39+00:00
Use explicit syntax rather than pure

- - - - -
4553c6de by Matthew Pickering at 2023-12-21T17:31:39+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.

- - - - -
407807be by Matthew Pickering at 2023-12-21T17:31:39+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).

- - - - -
b896c1c2 by Matthew Pickering at 2023-12-21T17:32:13+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
-------------------------

- - - - -
98c760f0 by GHC GitLab CI at 2023-12-21T17:32:14+00:00
fix

- - - - -
d3b16386 by GHC GitLab CI at 2023-12-21T17:32:14+00:00
Build genapply per stage

- - - - -
e178f029 by GHC GitLab CI at 2023-12-21T17:32:14+00:00
Correct GHC_PKG path

- - - - -
2a8f4dcd by GHC GitLab CI at 2023-12-21T17:32:14+00:00
Don't build genapply for javascript backend

- - - - -
3217b561 by Matthew Pickering at 2023-12-21T17:32:14+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.

- - - - -
74f133a8 by Matthew Pickering at 2023-12-21T17:32:14+00:00
Fix exe path

- - - - -
5aa6cd49 by Matthew Pickering at 2023-12-21T17:32:14+00:00
Disable docs when cross compiling

- - - - -
8619b604 by Matthew Pickering at 2023-12-21T17:48:14+00:00
Add missing req_interp modifier

- - - - -


30 changed files:

- .gitlab/ci.sh
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
- compiler/GHC/Settings/IO.hs
- 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


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/858431a1a7b99422c9b109239aa0f0f418412aac...8619b604c7a864c6a2d378c9012b4cb0a41bae2f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/858431a1a7b99422c9b109239aa0f0f418412aac...8619b604c7a864c6a2d378c9012b4cb0a41bae2f
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/20231221/c4fe3326/attachment.html>


More information about the ghc-commits mailing list