Update

Author: andreabedini

.github/workflows/ci.yml

@@ -70,13 +70,10 @@ jobs:
           dist-newstyle
 
     - name: Build patched cabal
-      run: |
-        cabal build --project-dir libraries/Cabal cabal-install:exe:cabal
-        CABAL=$(cabal list-bin -v0 --project-dir libraries/Cabal cabal-install:exe:cabal)
-        echo "CABAL=${CABAL}" >> $GITHUB_ENV
+      run: make cabal
 
     - name: Build stage1
-      run: ${CABAL} build --project-file cabal.project.stage0 ghc-bin:exe:ghc
+      run: make stage1-ghc
 
     - name: Save GHCup cache
       uses: actions/cache/save@v4

Makefile

@@ -5,28 +5,45 @@ SHELL := bash
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-export CABAL := $(shell cabal list-bin -v0 --project-dir libraries/Cabal cabal-install:exe:cabal)
-export CABAL_ARGS_STAGE1 =--project-file cabal.project.stage1
-export GHC_STAGE1 := $(shell cabal list-bin -v0 $(CABAL_ARGS_STAGE1) ghc-bin:exe:ghc)
+GHC ?= ghc
+GHC_VERSION=$(shell $(GHC) --numeric-version)
 
-all: $(GHC_STAGE1)
+STAGE ?= stage1
+
+BUILD_DIR = _build/$(STAGE)/build
+STORE_DIR = _build/$(STAGE)/store
+
+GHC = _build/$(STAGE)/bin/ghc
+
+CABAL := _build/cabal/bin/cabal
+
+.PHONY: all
+all: stage1-ghc
 
 cabal: $(CABAL)
-	
+
 $(CABAL):
-	cabal build --project-dir libraries/Cabal cabal-install:exe:cabal
+	echo "Building cabal for $(STAGE)"
+	mkdir -p $(@D)
+	cabal build --builddir $(abspath _build/cabal/build) --project-dir libraries/Cabal cabal-install:exe:cabal
+	BIN=$$(cabal list-bin -v0 --builddir $(abspath _build/cabal/build) --project-dir libraries/Cabal cabal-install:exe:cabal)
+	ln -svf $$BIN $@
 
-CONFIG_SCRIPTS := $(wildcard libraries/*/configure.ac)
+all-config-scripts: $(CONFIG_SCRIPTS)
 
-$(CONFIG_SCRIPTS:%.ac=%) : % : %.ac
+CONFIG_SCRIPTS := $(patsubst %.ac,%,$(wildcard libraries/*/configure.ac))
+
+$(CONFIG_SCRIPTS) : % : %.ac
 	autoreconf -i -f $(@D)
 
-$(GHC_STAGE1): $(CABAL) $(CONFIG_SCRIPTS)
-	$(CABAL) build $(CABAL_ARGS_STAGE1) ghc-bin:exe:ghc
+stage1-ghc: STAGE=stage1
+stage1-ghc: $(GHC)
+
+$(GHC): $(CABAL) $(CONFIG_SCRIPTS)
+	echo "Building GHC ($(GHC)) for $(STAGE)"
+	mkdir -p $(@D)
+	$(CABAL) --store-dir $(STORE_DIR) build --builddir $(BUILD_DIR) --project-file cabal.project.$(STAGE) ghc-bin:exe:ghc
 
 clean:
 	rm -rf _build
-
-clean-submodules:
 	git submodule foreach git clean -dxf
-