X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=1e39b6f88ded5d4eb94e6ffdb1af29d0a19d6e75;hb=85b74fd854bdeb89f71d7dcee571a39960cbccdd;hp=5281d130352240576db46e28328d97acd1d596b0;hpb=0bffc410964e1688ad80d277d53400659e697ab5;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 5281d13..1e39b6f 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -20,7 +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.
-UseGhcForCc = $(shell if (test "x$(BootingFromHc)" = "xYES"); then echo NO; else echo YES; fi)
+UseGhcForCc = YES
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -36,6 +36,11 @@ NON_HS_PACKAGE = YES
 # grab sources from these subdirectories
 ALL_DIRS = hooks parallel
 
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ALL_DIRS += win32
+EXCLUDED_SRCS += Itimer.c Select.c Signals.c
+endif
+
 ifneq "$(DLLized)" "YES"
 EXCLUDED_SRCS += RtsDllMain.c
 else
@@ -82,6 +87,10 @@ 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.
@@ -101,11 +110,6 @@ ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
-ifeq "$(BootingFromHc)" "YES"
-# use the normal $(CC) when booting from .hc files
-SRC_CC_OPTS += $(HC_OPTS)
-endif
-
 # Currently, you only get 'threads support' in the normal
 # way.
 ifeq "$(GhcRtsThreaded)" "YES"
@@ -124,6 +128,21 @@ 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
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
@@ -132,6 +151,7 @@ ifneq "$(GTK_CONFIG)" ""
 ifeq "$(GhcRtsWithFrontPanel)" "YES"
 SRC_HC_OPTS 		+= `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
 VisCallbacks_CC_OPTS 	+= -Wno-unused
+SRC_MKDEPENDC_OPTS	+= `$(GTK_CONFIG) --cflags`
 else # GhcRtsWithFrontPanel
 EXCLUDED_SRCS		+= $(wildcard Vis*.c)
 endif
@@ -150,15 +170,16 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 
 AUTO_APPLY = AutoApply.hc
 
-gen_apply : GenApply.hs
-	$(GHC) -o $@ -I$(GHC_INCLUDE_DIR) GenApply.hs 
-
+ifneq "$(BootingFromHc)" "YES"
 $(AUTO_APPLY): $(GHC_GENAPPLY)
 	@$(RM) $@
 	$(GHC_GENAPPLY) >$@
+endif
 
 EXTRA_SRCS += $(AUTO_APPLY)
 
+CLEAN_FILES += $(AUTO_APPLY)
+
 # -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.
@@ -192,16 +213,9 @@ endif
 
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkHaskellSupport)" "YES"
-ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 boot ::
-	cd gmp && ./configure --enable-shared=no \
+	cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \
 		--host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`
-else
-# Pass --target to configure of GMP, so that building for mingwin under
-# cygwin works properly (when the host is not the same as the target)
-boot ::
-	cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no --target=$(HOSTPLATFORM)
-endif
 
 # Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc.