From c872dd3e96aeacfeff2c7e4f3991aa28cd6d4734 Mon Sep 17 00:00:00 2001 From: ross Date: Thu, 15 Jan 2004 18:04:47 +0000 Subject: [PATCH] [project @ 2004-01-15 18:04:45 by ross] The haskell-src package is no longer needed for bootstrapping. --- ghc/compiler/Makefile | 2 +- mk/bootstrap.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index d8c210f..6732083 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -272,7 +272,7 @@ endif # Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interpreter, readline, and Template Haskell extensions -SRC_HC_OPTS += -DGHCI -package template-haskell -package haskell-src +SRC_HC_OPTS += -DGHCI -package template-haskell ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" SRC_HC_OPTS += -package unix ifeq "$(GhcLibsWithReadline)" "YES" diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index 08fa127..32d1313 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: bootstrap.mk,v 1.28 2004/01/15 14:43:24 igloo Exp $ +# $Id: bootstrap.mk,v 1.29 2004/01/15 18:04:45 ross Exp $ # # Makefile rules for booting from .hc files without a driver. # @@ -88,7 +88,6 @@ DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp endif HC_BOOT_LD_OPTS = \ - -L$(FPTOOLS_TOP_ABS)/libraries/haskell-src \ -L$(FPTOOLS_TOP_ABS)/ghc/rts \ $(DASH_L_GHC_RTS_GMP_DIR) \ -L$(FPTOOLS_TOP_ABS)/libraries/base \ @@ -143,7 +142,7 @@ ifeq "$(GhcWithInterpreter)" "YES" HC_BOOT_LIBS += -lHSreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits endif -HC_BOOT_LIBS += -lHShaskell98 -lHShaskell-src -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS) +HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS) ifeq "$(GhcLibsWithReadline)" "YES" HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline)) -- 1.7.10.4