X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=fc26319e81ea93730788b1cf38d1b807beaeb040;hp=1ce9751b026898a6936b3723c30731de29e3004d;hb=c222ce6d2dcde7dcef36d95fc225fd65d56bdb63;hpb=88e09197fcd710148c7a6b990b9a2b4706b49881

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1ce9751..fc26319 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -507,10 +507,9 @@ endif
 FPTOOLS_TOP_ABS		= @hardtop@
 
 BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TOPDIR_REL=$(FPTOOLS_TOP)
 BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
 BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME)
-BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR_REL)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
+BIN_DIST_TARBALL=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
 
 # Definition of installation directories, we don't use half of these, but since
 # the configure script has them on offer while passing through, we might as well
@@ -856,9 +855,14 @@ NHC		= @NHC@
 # tree).  We can refer to "this ghc" as $(GHC_INPLACE):
 
 GHC_INPLACE 	= $(GHC_COMPILER_DIR)/ghc-inplace
-GHC_STAGE1 	= $(GHC_COMPILER_DIR)/stage1/ghc-inplace
-GHC_STAGE2 	= $(GHC_COMPILER_DIR)/stage2/ghc-inplace
-GHC_STAGE3 	= $(GHC_COMPILER_DIR)/stage3/ghc-inplace
+GHC_STAGE1 	= $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf
+GHC_STAGE2 	= $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf
+GHC_STAGE3 	= $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf
+
+# NOTE: add -no-user-package-conf for stage 1-3 above, so that
+# we avoid picking up any packages the user might happen to have
+# installed for this GHC version.  They are bound to be incompatible
+# with the packages we built in the tree.
 
 ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" ""
 
@@ -872,9 +876,6 @@ GhcPatchLevel	= @ProjectPatchLevel@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 
-ghc_ge_601 = YES
-ghc_ge_602 = YES
-ghc_ge_603 = YES
 ghc_ge_605 = YES
 ghc_ge_607 = YES
 
@@ -888,9 +889,6 @@ GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 
 # Some useful GHC version predicates:
-ghc_ge_601 = @ghc_ge_601@
-ghc_ge_602 = @ghc_ge_602@
-ghc_ge_603 = @ghc_ge_603@
 ghc_ge_605 = @ghc_ge_605@
 ghc_ge_607 = @ghc_ge_607@
 endif
@@ -1109,7 +1107,7 @@ HAPPY_VERSION		= @HappyVersion@
 #
 # Options to pass to Happy when we're going to compile the output with GHC
 #
-GHC_HAPPY_OPTS		= -agc
+GHC_HAPPY_OPTS		= -agc --strict
 
 # Temp. to work around performance problems in the HEAD around 8/12/2003,
 # A Happy compiled with this compiler needs more stack.