[project @ 2002-06-14 08:23:57 by simonpj]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 2deb605..c4ce2a3 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.215 2002/04/22 14:35:02 simonmar Exp $
+# $Id: Makefile,v 1.219 2002/06/14 08:23:57 simonpj Exp $
 
 TOP = ..
 
@@ -11,6 +11,10 @@ endif
 
 include $(TOP)/mk/boilerplate.mk
 
+USER_SRCS = $(filter-out $(DERIVED_SRCS),$(SRCS))
+count :
+       ./count_lines $(USER_SRCS)
+
 #-----------------------------------------------------------------------------
 # Building ghc different ways (default is just `normal' sequential)
 WAYS=$(GhcCompilerWays)
@@ -25,7 +29,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 +129,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 +139,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)
 
@@ -241,7 +238,7 @@ endif
 #      because it contains 'ccall strlen' and 'ccall memcmp', which gets 
 #      inlined by gcc, causing a lack of registers.
 #
-utils/PrimPacked_HC_OPTS       = -fvia-C -monly-2-regs
+utils/PrimPacked_HC_OPTS       = -fvia-C
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
@@ -269,6 +266,10 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 main/SysTools_HC_OPTS          += '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
+# ghc_strlen percolates through so many modules that it is easier to get its
+# prototype via a global option instead of a myriad of per-file OPTIONS
+SRC_HC_OPTS += '-\#include "hschooks.h"'
+
 # ----------------------------------------------------------------------------
 #              Generate supporting stuff for prelude/PrimOp.lhs 
 #              from prelude/primops.txt