Skip to content

Commit 5dc82ba

Browse files
committed
feat: replace some submodules with official versions
This removes the need of a separate bootstrap.
1 parent 656d688 commit 5dc82ba

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ GHC = $(STAGE_DIR)/bin/ghc
1212
all: $(CABAL)
1313
./Build.hs
1414

15+
CONFIGURE_AC := $(shell git ls-files '**/configure.ac')
16+
CONFIGURE := $(CONFIGURE_AC:%.ac=)
17+
18+
$(CONFIGURE) : % : %.ac
19+
autoreconf -i -Wall $(@D)
20+
1521
$(CABAL0):
1622
mkdir -p $(@D)
1723
cabal install --project-dir libraries/Cabal --installdir $(abspath $(@D)) cabal-install:exe:cabal
@@ -24,7 +30,7 @@ STAGE$(STAGE)_TARGETS += $(addprefix $(STAGE_DIR)/bin/,$(STAGE$(STAGE)_EXES))
2430
.PHONY: stage$(STAGE)
2531
stage$(STAGE): $$(STAGE$(STAGE)_TARGETS)
2632

27-
$$(STAGE$(STAGE)_TARGETS) &: $(CABAL0)
33+
$$(STAGE$(STAGE)_TARGETS) &: $(CABAL0) $(CONFIGURE)
2834
$(CABAL0) $(CABAL_ARGS) install --project-file cabal.project.stage$(STAGE) --installdir $$(abspath $$(@D)) $(addprefix exe:,$(STAGE$(STAGE)_EXES))
2935
endef
3036

cabal.project.stage1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ packages:
66
./compiler
77
./ghc
88
./rts-includes
9-
./libraries/directory
9+
https://hackage.haskell.org/package/directory-1.3.9.0/directory-1.3.9.0.tar.gz
1010
./libraries/file-io
1111
./libraries/filepath
1212
./libraries/ghc-platform
1313
./libraries/ghc-boot
1414
./libraries/ghc-boot-th
1515
./libraries/ghc-heap
1616
./libraries/ghci
17-
./libraries/os-string
18-
./libraries/process
17+
https://hackage.haskell.org/package/os-string-2.0.7/os-string-2.0.7.tar.gz
18+
https://hackage.haskell.org/package/process-1.6.25.0/process-1.6.25.0.tar.gz
1919
./libraries/rts-fs
2020
./libraries/semaphore-compat
21-
./libraries/time
22-
./libraries/unix
21+
https://hackage.haskell.org/package/time-1.14/time-1.14.tar.gz
22+
https://hackage.haskell.org/package/unix-2.8.6.0/unix-2.8.6.0.tar.gz
2323
./libraries/Win32
2424
./utils/ghc-pkg
2525
./utils/hsc2hs

0 commit comments

Comments
 (0)