X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=f18e0a863f4696638cf2cdb595e66a9ae1874850;hb=9ea0c515038cb9670f9e77309ef90055ffb2d4ed;hp=19163ee8d7ee81e09550a58edddacc1a0757d2a8;hpb=2841c2c3238de618025369cac0d79ad2db4dc91e;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 19163ee..f18e0a8 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -20,15 +20,25 @@ 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
 
+PACKAGE = rts
+
 HC=$(GHC_INPLACE)
 
-WAYS=$(GhcLibWays)
+# -----------------------------------------------------------------------------
+# RTS ways
 
-PACKAGE = rts
+WAYS=$(GhcLibWays) $(GhcRTSWays)
+
+ifneq "$(findstring debug, $(way))" ""
+GhcRtsHcOpts=
+GhcRtsCcOpts=-g
+endif
+
+# -----------------------------------------------------------------------------
 
 # Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
 NON_HS_PACKAGE = YES
@@ -110,20 +120,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"
-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
@@ -133,6 +129,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?
 
@@ -141,6 +152,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
@@ -159,12 +171,11 @@ 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)
 
@@ -203,16 +214,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.