[project @ 2001-04-12 21:29:43 by lewie]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 4dc4ca4..750af8e 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.150 2001/03/27 16:32:46 rrt Exp $
+# $Id: Makefile,v 1.153 2001/04/11 10:24:38 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -96,7 +96,7 @@ ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler
 ghc_411_at_least = 1
 else
-ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11)
+ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11)
 endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
@@ -218,6 +218,7 @@ utils/PrimPacked_HC_OPTS    = -fvia-C -monly-3-regs
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
+ghci/ByteCodeLink_HC_OPTS      = -fvia-C
 
 # CSE interacts badly with the top-level IORefs in DriverState, causing some
 # of them to be commoned up.  We have a fix for this in 5.00+, but earlier
@@ -299,7 +300,7 @@ all :: ghc-inplace
 ghc-inplace : $(HS_PROG)
        @$(RM) $@
        echo '#!/bin/sh' >>$@
-       echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
+       echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
        chmod 755 $@
 
 CLEAN_FILES += ghc-inplace