summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-12-12 17:02:28 +0100
committerBen Gamari <ben@smart-cactus.org>2015-12-12 18:39:22 +0100
commitaaed24a4e0d8fa0d49aca167fddfb8b606755e05 (patch)
tree11994f8d1e4180e35540aff09b300d7676d4b75b /Makefile
parent3640ae92fc1ffa283425203bba3dbf231fcb3e52 (diff)
downloadhaskell-aaed24a4e0d8fa0d49aca167fddfb8b606755e05.tar.gz
Build system: fix 'make install-strip' in bindist
The INSTALL_PROGRAM variable is set in mk/config.mk, so we have to include that file before using it. Running 'make install' before './configure' in a bindist will now also display a nice message. Reviewers: hvr, austin, bgamari Reviewed By: bgamari Differential Revision: https://phabricator.haskell.org/D1604 GHC Trac Issues: #1851
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile25
1 files changed, 13 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 348375f9c2..6be584f536 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,18 @@
MAKEFLAGS += --no-builtin-rules
.SUFFIXES:
+ifneq "$(filter maintainer-clean distclean clean clean_% help,$(MAKECMDGOALS))" ""
+-include mk/config.mk
+else
+include mk/config.mk
+ifeq "$(ProjectVersion)" ""
+$(error Please run ./configure first)
+endif
+endif
+
+include mk/custom-settings.mk
+
+
ifeq "$(wildcard distrib/)" ""
# We're in a bindist
@@ -45,7 +57,7 @@ install show:
.PHONY: install-strip
install-strip:
# See Note [install-strip].
- $(MAKE) --no-print-directory -f ghc.mk INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+ $(MAKE) --no-print-directory -f ghc.mk INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install BINDIST=YES NO_INCLUDE_DEPS=YES
else
@@ -58,17 +70,6 @@ default : all
help:
@cat MAKEHELP.md
-ifneq "$(filter maintainer-clean distclean clean clean_% help,$(MAKECMDGOALS))" ""
--include mk/config.mk
-else
-include mk/config.mk
-ifeq "$(ProjectVersion)" ""
-$(error Please run ./configure first)
-endif
-endif
-
-include mk/custom-settings.mk
-
# Verify that stage 0 LLVM backend isn't affected by Bug #9439 if needed
ifeq "$(GHC_LLVM_AFFECTED_BY_9439)" "1"
ifneq "$(findstring -fllvm,$(SRC_HC_OPTS) $(GhcHcOpts) $(GhcStage1HcOpts))" ""