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

Use bootstrap project in bootstrapping
haskell · May 17, 2024 · 3b4b3e1 · 3b4b3e1
2 parents b7ed4f7 + 3c84288
commit 3b4b3e1
Showing 1 changed file with 1 addition and 1 deletion.
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"
 }