summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-12-19 01:01:30 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2015-12-19 01:05:45 +0100
commitccc5a1a28ca49392f8c7a56b231007476aa5efa8 (patch)
tree087d92ed62fc0d67f992e3d61ae549f4f778ad97
parent97281b4605dac473458f144cbf6444b512e22e2a (diff)
downloadhaskell-ccc5a1a28ca49392f8c7a56b231007476aa5efa8.tar.gz
Build system: fix 'make sdist'
This was broken in 4905b83a2d448c65ccced385343d4e8124548a3b. libraries/ghci/ghc.mk gets created by ./boot.
-rw-r--r--ghc.mk2
-rw-r--r--libraries/ghci/ghc.mk5
2 files changed, 1 insertions, 6 deletions
diff --git a/ghc.mk b/ghc.mk
index ba9aead576..1bd54154bd 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1155,7 +1155,7 @@ SRC_DIST_TESTSUITE_TARBALL = $(SRC_DIST_ROOT)/$(SRC_DIST_TESTSUITE_NAME).
# Files to include in source distributions
#
SRC_DIST_GHC_DIRS = mk rules docs distrib bindisttest libffi includes \
- utils docs rts compiler ghc driver libraries libffi-tarballs
+ utils docs rts compiler ghc driver libraries libffi-tarballs iserv
SRC_DIST_GHC_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README.md ANNOUNCE HACKING.md INSTALL.md LICENSE Makefile \
diff --git a/libraries/ghci/ghc.mk b/libraries/ghci/ghc.mk
deleted file mode 100644
index dc6a891bf3..0000000000
--- a/libraries/ghci/ghc.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-libraries/ghci_PACKAGE = ghci
-libraries/ghci_dist-install_GROUP = libraries
-$(if $(filter ghci,$(PACKAGES_STAGE0)),$(eval $(call build-package,libraries/ghci,dist-boot,0)))
-$(if $(filter ghci,$(PACKAGES_STAGE1)),$(eval $(call build-package,libraries/ghci,dist-install,1)))
-$(if $(filter ghci,$(PACKAGES_STAGE2)),$(eval $(call build-package,libraries/ghci,dist-install,2)))