From ea9c5577e06342269e15b278d58e54876b822408 Mon Sep 17 00:00:00 2001 From: sof Date: Wed, 29 May 2002 22:39:39 +0000 Subject: [PATCH] [project @ 2002-05-29 22:39:39 by sof] - nuke ghc_{501,502}_at_least defns, no longer used. - mingw/cygwin cross-compilation tweak. --- ghc/compiler/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 5104714..dd65b1a 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.217 2002/05/11 10:02:21 panne Exp $ +# $Id: Makefile,v 1.218 2002/05/29 22:39:39 sof Exp $ TOP = .. @@ -25,7 +25,7 @@ WAYS=$(GhcCompilerWays) # equivalent of `env' if it doesn't exist locally). # ifneq "$(way)" "dll" -ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" HS_PROG=ghc$(_way)-$(ProjectVersion) else HS_PROG=ghc$(_way) @@ -125,7 +125,6 @@ compiling_with_4xx=NO else bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi) compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi) -ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi) endif # Only include GHCi if we're bootstrapping with at least version 411 @@ -136,12 +135,6 @@ ALL_DIRS += ghci endif endif -# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in -# for explanatory comment as to what this does. -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" -ghc_501_at_least = $(shell if (test $(GhcVanonVersion) -ge 5010); then echo YES; else echo NO; fi) -endif - # There are some C files to include in HS_PROG, so add these to HS_OBJS HS_OBJS += $(C_OBJS) -- 1.7.10.4