From: simonmar Date: Fri, 14 Jan 2005 11:34:44 +0000 (+0000) Subject: [project @ 2005-01-14 11:34:44 by simonmar] X-Git-Tag: Initial_conversion_from_CVS_complete~1238 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=20b21f5bd6cbb71919da4db7137d355ae5efe4ac;p=ghc-hetmet.git [project @ 2005-01-14 11:34:44 by simonmar] retire $(compiling_with_4xx): we don't support compiling with 4.x any more --- diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 83d69db..9c865f4 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -261,14 +261,11 @@ endif ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES -compiling_with_4xx=NO else ifneq "$(findstring $(stage), 2 3)" "" bootstrapped = YES -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) endif endif @@ -406,11 +403,6 @@ ifeq "$(bootstrapped)" "YES" utils/Binary_HC_OPTS = -funbox-strict-fields endif -# 4.08.2's NCG can't cope with Binary -ifeq "$(compiling_with_4xx)" "YES" -utils/Binary_HC_OPTS += -fvia-C -endif - # ByteCodeItbls uses primops that the NCG doesn't support yet. ghci/ByteCodeItbls_HC_OPTS += -fvia-C ghci/ByteCodeLink_HC_OPTS += -fvia-C -monly-3-regs