From 3c842886551536ff6e8de1ebf2be6c03140e4080 Mon Sep 17 00:00:00 2001 From: sheaf Date: Wed, 8 May 2024 16:23:53 +0100 Subject: [PATCH] Use bootstrap project in bootstrapping We need to use the cabal.bootstrap.project file to generate the bootstrap plans, otherwise we try to include test components when bootstrapping, which is not useful (and significantly complicates bootstrapping). --- bootstrap/generate_bootstrap_plans | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/generate_bootstrap_plans b/bootstrap/generate_bootstrap_plans index 4357a7a9843..d10b958deb5 100755 --- a/bootstrap/generate_bootstrap_plans +++ b/bootstrap/generate_bootstrap_plans @@ -10,7 +10,7 @@ run() { local drv="ghc-$ver" echo "$ver" nix build -f "$ghcs_nix" $drv - (cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.release.project --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc) + (cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --project-file=cabal.bootstrap.project --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc) jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json" cabal run --with-ghc-pkg $PWD/boot_ghc/bin/ghc-pkg -w $PWD/boot_ghc/bin/ghc -v0 cabal-bootstrap-gen -- "plan-$ver.json" | jq --sort-keys | tee "linux-$(echo $ver | tr "_" ".").json" }