Skip to content

Commit 5be899d

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

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
@@ -15,6 +15,12 @@ all: $(CABAL0)
1515

1616
.PHONY: cabal
1717
cabal: $(CABAL0)
18+
19+
CONFIGURE_AC := $(shell git ls-files '**/configure.ac')
20+
CONFIGURE := $(CONFIGURE_AC:%.ac=)
21+
22+
$(CONFIGURE) : % : %.ac
23+
autoreconf -i -Wall $(@D)
1824

1925
$(CABAL0):
2026
mkdir -p $(@D)
@@ -28,7 +34,7 @@ STAGE$(STAGE)_TARGETS += $(addprefix $(STAGE_DIR)/bin/,$(STAGE$(STAGE)_EXES))
2834
.PHONY: stage$(STAGE)
2935
stage$(STAGE): $$(STAGE$(STAGE)_TARGETS)
3036

31-
$$(STAGE$(STAGE)_TARGETS) &: $(CABAL0)
37+
$$(STAGE$(STAGE)_TARGETS) &: $(CABAL0) $(CONFIGURE)
3238
$(CABAL0) $(CABAL_ARGS) install --project-file cabal.project.stage$(STAGE) --installdir $$(abspath $$(@D)) $(addprefix exe:,$(STAGE$(STAGE)_EXES))
3339
endef
3440

cabal.project.stage1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ packages:
77
./ghc
88
./rts-includes
99
./rts-fs
10-
./libraries/directory
10+
https://hackage.haskell.org/package/directory-1.3.9.0/directory-1.3.9.0.tar.gz
1111
./libraries/file-io
1212
./libraries/filepath
1313
./libraries/ghc-platform
1414
./libraries/ghc-boot
1515
./libraries/ghc-boot-th
1616
./libraries/ghc-heap
1717
./libraries/ghci
18-
./libraries/os-string
19-
./libraries/process
18+
https://hackage.haskell.org/package/os-string-2.0.7/os-string-2.0.7.tar.gz
19+
https://hackage.haskell.org/package/process-1.6.25.0/process-1.6.25.0.tar.gz
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)