projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the build with GHC < 6.4 (foldl1' didn't exist)
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
be09d35
..
19916ef
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-446,7
+446,7
@@
endif
ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
-# Yes, include the interepreter, readline, and Template Haskell extensions
+# Yes, include the interepreter and Template Haskell extensions
SRC_HC_OPTS += -DGHCI -package template-haskell
PKG_DEPENDS += template-haskell
SRC_HC_OPTS += -DGHCI -package template-haskell
PKG_DEPENDS += template-haskell
@@
-493,7
+493,7
@@
SRC_HC_OPTS += -package readline -DUSE_READLINE
PKG_DEPENDS += readline
endif
else
PKG_DEPENDS += readline
endif
else
--include $(FPTOOLS_TOP)/libraries/readline/config.mk
+-include $(FPTOOLS_TOP_ABS)/libraries/readline/config.mk
# readline's config.mk sets PACKAGE, which we don't want here
PACKAGE=
ifeq "$(READLINE_BUILD_PACKAGE)" "yes"
# readline's config.mk sets PACKAGE, which we don't want here
PACKAGE=
ifeq "$(READLINE_BUILD_PACKAGE)" "yes"
@@
-864,8
+864,14
@@
GhcLibWays = $(GhcCompilerWays)
# override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence
GhcLibHcOpts =
# override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence
GhcLibHcOpts =
+ifeq "$(DOING_BIN_DIST)" "YES"
+# This is derived from the sources when we are in a source tree, but we
+# don't have any sources in a bindist, so we have to shortcut it
+HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
+else
# override default definition of HS_IFACES so we can add $(odir)
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
# override default definition of HS_IFACES so we can add $(odir)
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
+endif
# Haddock can't handle recursive modules currently, so we disable it for now.
override HADDOCK_DOCS = NO
# Haddock can't handle recursive modules currently, so we disable it for now.
override HADDOCK_DOCS = NO
@@
-940,12
+946,6
@@
endif
#-----------------------------------------------------------------------------
# binary-dist
#-----------------------------------------------------------------------------
# binary-dist
-ifeq "$(DOING_BIN_DIST)" "YES"
-# This is derived from the sources when we are in a source tree, but we
-# don't have any sources in a bindist, so we have to shortcut it
-HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
-endif
-
binary-dist:
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage)
binary-dist:
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage)