Merge pull request #9990 from haskell/bootstrap-project-1

mergify[bot] · web-flow · commit 3b4b3e1dbf04 · 2024-05-17T18:40:12.000Z
Use bootstrap project in bootstrapping
diff --git 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"
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ run() {`
`10`	`10`	`local drv="ghc-$ver"`
`11`	`11`	`echo "$ver"`
`12`	`12`	`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)`
`14`	`14`	`jq --sort-keys < ../dist-bootstrap/cache/plan.json > "plan-$ver.json"`
`15`	`15`	`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"`
`16`	`16`	`}`