projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We always install stage2, so we need to always put stage2 into bindists
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
275de62
..
6b8f300
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-78,14
+78,9
@@
clean.stage.%:
CONFIGURE_FLAGS_STAGE1 += --flags=stage1
CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
CONFIGURE_FLAGS_STAGE1 += --flags=stage1
CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
-CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
-
ifeq "$(GhcWithNativeCodeGen)" "YES"
CONFIGURE_FLAGS_STAGE1 += --flags=ncg
CONFIGURE_FLAGS_STAGE2 += --flags=ncg
ifeq "$(GhcWithNativeCodeGen)" "YES"
CONFIGURE_FLAGS_STAGE1 += --flags=ncg
CONFIGURE_FLAGS_STAGE2 += --flags=ncg
-else
-CONFIGURE_FLAGS_STAGE1 += --flags=-ncg
-CONFIGURE_FLAGS_STAGE2 += --flags=-ncg
endif
ifeq "$(GhcWithInterpreter)" "YES"
endif
ifeq "$(GhcWithInterpreter)" "YES"
@@
-99,8
+94,6
@@
CONFIGURE_FLAGS_STAGE2 += --enable-shared
# function which sets the keepCAFs flag for the RTS before any Haskell
# code is run.
CONFIGURE_FLAGS_STAGE2 += --flags=dynlibs
# function which sets the keepCAFs flag for the RTS before any Haskell
# code is run.
CONFIGURE_FLAGS_STAGE2 += --flags=dynlibs
-else
-CONFIGURE_FLAGS_STAGE2 += --flags=-dynlibs
endif
ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
endif
ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
@@
-127,9
+120,6
@@
ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" ""
CONFIGURE_FLAGS_STAGE2 += --flags=editline
endif
endif
CONFIGURE_FLAGS_STAGE2 += --flags=editline
endif
endif
-
-else
-CONFIGURE_FLAGS_STAGE2 += --flags=-ghci
endif
ifeq "$(GhcWithNativeCodeGen)" "NO"
endif
ifeq "$(GhcWithNativeCodeGen)" "NO"
@@
-184,7
+174,7
@@
CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
- test -e $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
+ test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
$(CABAL) configure --distpref dist-stage$* \
$(CONFIGURE_FLAGS_STAGE$*) \
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
$(CABAL) configure --distpref dist-stage$* \
$(CONFIGURE_FLAGS_STAGE$*) \
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
@@
-203,9
+193,8
@@
doc.stage.%:
--haddock-option=--optghc=-DSTAGE=$* \
--with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
--haddock-option=--optghc=-DSTAGE=$* \
--with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
-# XXX We ought to actually install the (stage 2) library
install:
install:
- @:
+ $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' --distpref dist-stage2
# -----------------------------------------------------------------------------
# Create compiler configuration
# -----------------------------------------------------------------------------
# Create compiler configuration
@@
-462,6
+451,14
@@
install-docs:
# binary-dist
#
# binary-dist
#
+# Ideally we'd get these from the Cabal file's Install-Includes:
+BINDIST_EXTRAS += HsVersions.h
+ifeq "$(stage)" "1"
+BINDIST_EXTRAS += stage1/ghc_boot_platform.h
+else
+BINDIST_EXTRAS += stage2plus/ghc_boot_platform.h
+endif
+
include $(TOP)/mk/bindist.mk
include $(TOP)/mk/bindist.mk
-LIB_DIST_DIR = dist-stage$(stage)
+LIB_DIST_DIR = dist-stage2