diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2018-12-16 08:58:41 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2019-01-09 14:32:21 +0000 |
| commit | 6486c6e49c53e75f37ed732b38c5be7ae64785e8 (patch) | |
| tree | 187785dd532474cd34aa4e66846b12f28f09f8b9 /hadrian/cfg | |
| parent | 6b70cf611e5ddc475edaa54b893d20990699ddb8 (diff) | |
| download | haskell-6486c6e49c53e75f37ed732b38c5be7ae64785e8.tar.gz | |
Hadrian: Add support for building stage3
This ticket enables the building of a `stage3` compiler by making the
build logic more consistent and predictable in Hadrian.
Two of the main changes are:
1. In order to build anything at stageN we use the package database
present at stageN. Fixing #16069
2. `haddock` and `ghc-tags` are built
as stage1 executables (with the stage1 compiler) rather than as
stage2 compiler. Fixing
[hadrian#661](https://github.com/snowleopard/hadrian/issues/661)
In order to build a stage3 compiler, you have to set the new `finalStage` hadrian option to `Stage3`.
Diffstat (limited to 'hadrian/cfg')
| -rw-r--r-- | hadrian/cfg/system.config.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index 344706d630..7e132f7d77 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -93,18 +93,22 @@ project-git-commit-id = @ProjectGitCommitId@ conf-cc-args-stage0 = @CONF_CC_OPTS_STAGE0@ conf-cc-args-stage1 = @CONF_CC_OPTS_STAGE1@ conf-cc-args-stage2 = @CONF_CC_OPTS_STAGE2@ +conf-cc-args-stage3 = @CONF_CC_OPTS_STAGE3@ conf-cpp-args-stage0 = @CONF_CPP_OPTS_STAGE0@ conf-cpp-args-stage1 = @CONF_CPP_OPTS_STAGE1@ conf-cpp-args-stage2 = @CONF_CPP_OPTS_STAGE2@ +conf-cpp-args-stage3 = @CONF_CPP_OPTS_STAGE3@ conf-gcc-linker-args-stage0 = @CONF_GCC_LINKER_OPTS_STAGE0@ conf-gcc-linker-args-stage1 = @CONF_GCC_LINKER_OPTS_STAGE1@ conf-gcc-linker-args-stage2 = @CONF_GCC_LINKER_OPTS_STAGE2@ +conf-gcc-linker-args-stage3 = @CONF_GCC_LINKER_OPTS_STAGE3@ conf-ld-linker-args-stage0 = @CONF_LD_LINKER_OPTS_STAGE0@ conf-ld-linker-args-stage1 = @CONF_LD_LINKER_OPTS_STAGE1@ conf-ld-linker-args-stage2 = @CONF_LD_LINKER_OPTS_STAGE2@ +conf-ld-linker-args-stage3 = @CONF_LD_LINKER_OPTS_STAGE3@ # Include and library directories: #================================= |