[project @ 2002-10-12 23:12:08 by wolfgang]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index d19471c..4f8c669 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,4 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.69 2002/02/18 17:26:48 sof Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -21,9 +20,7 @@ TOP=..
 # set of suffix rules for compiling C code, using $(HC) rather than $(CC)
 # and prepending "-optc" to $(CC_OPTS).  NB. must be done before including
 # boilerplate.mk below.
-ifneq "$(BootingFromHc)" "YES"
-UseGhcForCc = YES
-endif
+UseGhcForCc = $(shell if (test "x$(BootingFromHc)" = "xYES"); then echo NO; else echo YES; fi)
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -34,15 +31,11 @@ WAYS=$(GhcLibWays)
 PACKAGE = rts
 
 # Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
-NON_HS_PKG = YES
+NON_HS_PACKAGE = YES
 
 # grab sources from these subdirectories
 ALL_DIRS = hooks parallel
 
-ifeq "$(HaveLibGmp)" "YES"
-PACKAGE_CPP_OPTS += -DHAVE_LIBGMP
-endif
-
 ifneq "$(DLLized)" "YES"
 EXCLUDED_SRCS += RtsDllMain.c
 else
@@ -77,7 +70,7 @@ WARNING_OPTS += -Winline
 WARNING_OPTS += -Waggregate-return
 #WARNING_OPTS += -Wpointer-arith
 WARNING_OPTS += -Wbad-function-cast
-WARNING_OPTS += -Wcast-align
+#WARNING_OPTS += -Wcast-align
 #WARNING_OPTS += -Wnested-externs
 #WARNING_OPTS += -Wshadow
 #WARNING_OPTS += -Wcast-qual
@@ -123,10 +116,14 @@ endif
 endif
 
 # If -DDEBUG is in effect, adjust package conf accordingly..
-ifneq "$(strip $(filter -DDEBUG,$(CC_OPTS)))" ""
+ifneq "$(strip $(filter -optc-DDEBUG,$(GhcRtsHcOpts)))" ""
 PACKAGE_CPP_OPTS += -DDEBUG
 endif
 
+ifeq "$(HaveLibMingwEx)" "YES"
+PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
+endif
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
@@ -180,6 +177,7 @@ endif
 # and not worth re-implementing in our Makefile framework.
 
 ifneq "$(HaveLibGmp)" "YES"
+ifneq "$(HaveFrameworkHaskellSupport)" "YES"
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 boot ::
        cd gmp && ./configure --enable-shared=no \
@@ -211,6 +209,7 @@ clean distclean maintainer-clean ::
 
 INSTALL_LIBS += gmp/libgmp.a
 endif
+endif
 
 gmp/libgmp.a ::
        $(MAKE) -C gmp MAKEFLAGS=