Skip to content

Commit 3c84288

Browse files
sheafMikolaj
authored andcommitted
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).
1 parent b7ed4f7 commit 3c84288

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

bootstrap/generate_bootstrap_plans

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ run() {
1010
local drv="ghc-$ver"
1111
echo "$ver"
1212
nix build -f "$ghcs_nix" $drv
13-
(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)
13+
(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)
1414
jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json"
1515
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"
1616
}

0 commit comments

Comments
 (0)