X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=733399e22617cb75a47abdc0852fa7af81b01567;hb=8c4de43174d28741b5172397da3eb1c672cb876b;hp=f46cf959ce7081001ff431b6a7a51a482611a1ed;hpb=5e9fd7ed27f970084b4795c5c4619c30a953174f;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index f46cf95..733399e 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -24,11 +24,21 @@ 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
@@ -170,6 +166,12 @@ endif
 MKDEPENDC_SRCS     = $(C_SRCS) $(HC_SRCS)
 SRC_MKDEPENDC_OPTS += -I. -I../includes
 
+# Hack: we define every way-related option here, so that we get (hopefully)
+# a superset of the dependencies.  To do this properly, we should generate
+# a different set of dependencies for each way.  Further hack: PROFILING and
+# TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now.
+SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
+
 # -----------------------------------------------------------------------------
 # The auto-generated apply code
 
@@ -218,16 +220,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.