X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=4f8c669f2dac7ade4b5fa185c55c21f33e208b19;hb=73641e01ee9dfbe83f8c6225c1f6ae2e7d621b63;hp=9240686cd2ecef7a7af2763f12fbdc2bf0a0fc1a;hpb=18b9187c217336650abf6c267eda3000d031da82;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 9240686..4f8c669 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,4 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.68 2002/02/14 17:17:08 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
@@ -118,7 +111,17 @@ endif
 ifeq "$(GhcRtsThreaded)" "YES"
 ifeq "$(way)" ""
 SRC_CC_OPTS += -DTHREADED_RTS
+PACKAGE_CPP_OPTS += -DTHREADED_RTS
+endif
 endif
+
+# If -DDEBUG is in effect, adjust package conf accordingly..
+ifneq "$(strip $(filter -optc-DDEBUG,$(GhcRtsHcOpts)))" ""
+PACKAGE_CPP_OPTS += -DDEBUG
+endif
+
+ifeq "$(HaveLibMingwEx)" "YES"
+PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
 endif
 
 #-----------------------------------------------------------------------------
@@ -174,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 \
@@ -205,6 +209,7 @@ clean distclean maintainer-clean ::
 
 INSTALL_LIBS += gmp/libgmp.a
 endif
+endif
 
 gmp/libgmp.a ::
 	$(MAKE) -C gmp MAKEFLAGS=