From eea8fd53dce9b81a32e1e8c871ef6b3cf57295da Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 16 Oct 2006 11:09:26 +0000 Subject: [PATCH] Build the GHC package in stage 3 too This fixes the problem with the nightly builds not including the GHC package. --- compiler/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 4c0386e..8cc9720 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -192,7 +192,7 @@ else GHC_PROG=$(odir)/ghc-$(ProjectVersion) endif -ifneq "$(stage)" "2" +ifeq "$(stage)" "1" HS_PROG = $(GHC_PROG) endif @@ -822,13 +822,11 @@ coreSyn/CorePrep_HC_OPTS += -auto-all #----------------------------------------------------------------------------- # Building the GHC package -# The GHC package is made from the stage 2 build. Fortunately the -# package build system framework more or less does the right thing for -# us here. - -# All this section is stage-2 only! -ifeq "$(stage)" "2" +# The GHC package is made from the stage 2 build and later. +# Fortunately the package build system framework more or less does the +# right thing for us here. +ifneq "$(findstring $(stage), 2 3)" "" PACKAGE = ghc HIERARCHICAL_LIB = NO VERSION = $(ProjectVersion) -- 1.7.10.4