[project @ 2002-02-18 17:26:48 by sof]

If necessary, define THREADED_RTS and DEBUG when gen'ing rts.conf

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 9240686..d19471c 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.68 2002/02/14 17:17:08 sof Exp $
+# $Id: Makefile,v 1.69 2002/02/18 17:26:48 sof Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -118,9 +118,15 @@ 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 -DDEBUG,$(CC_OPTS)))" ""
+PACKAGE_CPP_OPTS += -DDEBUG
+endif
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 

diff --git a/ghc/rts/rts.conf.in b/ghc/rts/rts.conf.in
index 6c54bf4..f77f78c 100644 (file)
--- a/ghc/rts/rts.conf.in
+++ b/ghc/rts/rts.conf.in
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "Derived.h"
 
 Package {
        name           = "rts",  /* The RTS is just another package! */