X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=0a0fa9dfe62366c517668f3900b5bbb7e7144160;hb=96cf6fab96b503cef6e7f5bfd305e618bce120c8;hp=1be4e41ed57febb77444aac706f6c61237cca5fa;hpb=2cc5b907318f97e19b28b2ad8ed9ff8c1f401dcc;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 1be4e41..0a0fa9d 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,4 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.66 2002/02/12 15:17:22 simonmar 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,13 +31,14 @@ 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"
-PKG_CPP_OPTS += -DHAVE_LIBGMP
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ALL_DIRS += win32
+EXCLUDED_SRCS += Itimer.c Select.c Signals.c
 endif
 
 ifneq "$(DLLized)" "YES"
@@ -77,7 +75,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
@@ -85,18 +83,20 @@ WARNING_OPTS += -Wcast-align
 #WARNING_OPTS += -Wredundant-decls 
 #WARNING_OPTS += -Wconversion
 
-STANDARD_OPTS+=-I../includes -I. -Iparallel -DCOMPILING_RTS
+STANDARD_OPTS += -I../includes -I. -Iparallel
+# COMPILING_RTS is only used when building Win32 DLL support.
+STANDARD_OPTS += -DCOMPILING_RTS
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+STANDARD_OPTS += -Iwin32
+endif
 
 # HC_OPTS is included in both .c and .hc compilations, whereas CC_OPTS is
 # only included in .c compilations.  HC_OPTS included the WAY_* opts, which
 # must be included in both types of compilations.
 
 SRC_CC_OPTS += $(WARNING_OPTS)
-
-# Don't bother adding these to CC_OPTS; get them via HC_OPTS anyway.
-SRC_MKDEPENDC_OPTS += $(STANDARD_OPTS)
-
-SRC_HC_OPTS += $(STANDARD_OPTS)
+SRC_CC_OPTS += $(STANDARD_OPTS)
 
 SRC_CC_OPTS += $(GhcRtsCcOpts)
 SRC_HC_OPTS += $(GhcRtsHcOpts)
@@ -120,7 +120,32 @@ 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
+
+ifeq "$(DotnetSupport)" "YES"
+
+# 
+# Would like to just use SUBDIRS here, but need to
+# descend into dotnet/ earlier than that.
+#
+all ::
+	$(MAKE) -C dotnet all
+
+# But use SUBDIRS for other recursive targets.
+SUBDIRS += dotnet
+
+LIBOBJS += dotnet/Invoke.o
 endif
 
 #-----------------------------------------------------------------------------
@@ -145,6 +170,22 @@ MKDEPENDC_SRCS     = $(C_SRCS) $(HC_SRCS)
 SRC_MKDEPENDC_OPTS += -I. -I../includes
 
 # -----------------------------------------------------------------------------
+# The auto-generated apply code
+
+AUTO_APPLY = AutoApply.hc
+
+gen_apply : GenApply.hs
+	$(GHC) -o $@ -I$(GHC_INCLUDE_DIR) GenApply.hs 
+
+$(AUTO_APPLY): $(GHC_GENAPPLY)
+	@$(RM) $@
+	$(GHC_GENAPPLY) >$@
+
+EXTRA_SRCS += $(AUTO_APPLY)
+
+CLEAN_FILES += $(AUTO_APPLY)
+
+# -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 #
@@ -176,6 +217,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 \
@@ -207,6 +249,7 @@ clean distclean maintainer-clean ::
 
 INSTALL_LIBS += gmp/libgmp.a
 endif
+endif
 
 gmp/libgmp.a ::
 	$(MAKE) -C gmp MAKEFLAGS=