From b79ce3aaf4ac895b072c684f1500567ceae13e8c Mon Sep 17 00:00:00 2001 From: simonmar Date: Mon, 9 Jul 2001 10:46:46 +0000 Subject: [PATCH] [project @ 2001-07-09 10:46:46 by simonmar] Change the test for whether to include GHCi support in the compiler to be closer to "are we bootstrapping with the same compiler". --- ghc/compiler/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 4edc80b..0c76a79 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.170 2001/07/05 13:31:09 sewardj Exp $ +# $Id: Makefile,v 1.171 2001/07/09 10:46:46 simonmar Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -108,14 +108,14 @@ CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)...... ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler -ghc_411_at_least = YES +bootstrapped = YES else -ghc_411_at_least=$(shell if (test $(CANON_HC_VERSION) -ge 4110); then echo YES; else echo NO; fi) +bootstrapped = $(shell if (test $(CANON_HC_VERSION) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi) endif # Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" -ifeq "$(ghc_411_at_least)" "YES" +ifeq "$(bootstrapped)" "YES" SRC_HC_OPTS += -DGHCI DIRS += ghci endif -- 1.7.10.4