X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FMakefile;h=9c3e31218c5e10abaa22365ad3822862a713f885;hb=ab156cebd3fffe5c946de842837d189b35fbd44b;hp=cc4f49a64d62ec69809f5f86a7cd141b2a1d27f6;hpb=5881f6a50c9c85985149047295106123a1b8e62a;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index cc4f49a..9c3e312 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.63 2002/02/04 13:59:48 simonmar Exp $
+# $Id: Makefile,v 1.70 2002/04/13 05:18:07 sof Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -29,12 +29,20 @@ include $(TOP)/mk/boilerplate.mk
 
 HC=$(GHC_INPLACE)
 
-PACKAGE = rts
 WAYS=$(GhcLibWays)
 
+PACKAGE = rts
+
+# Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
+NON_HS_PKG = YES
+
 # grab sources from these subdirectories
 ALL_DIRS = hooks parallel
 
+ifeq "$(HaveLibGmp)" "YES"
+PACKAGE_CPP_OPTS += -DHAVE_LIBGMP
+endif
+
 ifneq "$(DLLized)" "YES"
 EXCLUDED_SRCS += RtsDllMain.c
 else
@@ -47,7 +55,9 @@ EXCLUDED_SRCS += parallel/SysMan.c
 HC_SRCS = $(filter %.hc, $(SRCS))
 HC_OBJS = $(patsubst %.hc,%.$(way_)o, $(HC_SRCS))
 
-# Override the default $(LIBOBJS) (the default provides for building Haskell libs)
+CLEAN_FILES += $(HC_OBJS)
+
+# Override the default $(LIBOBJS) (defaults to $(HS_OBJS))
 LIBOBJS = $(C_OBJS) $(HC_OBJS)
 
 SplitObjs=NO
@@ -75,13 +85,16 @@ WARNING_OPTS += -Wcast-align
 #WARNING_OPTS += -Wredundant-decls 
 #WARNING_OPTS += -Wconversion
 
+STANDARD_OPTS += -I../includes -I. -Iparallel
+# COMPILING_RTS is only used when building Win32 DLL support.
+STANDARD_OPTS += -DCOMPILING_RTS
+
 # 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)
-
-SRC_HC_OPTS += -I../includes -I. -Iparallel -DCOMPILING_RTS
+SRC_CC_OPTS += $(STANDARD_OPTS)
 
 SRC_CC_OPTS += $(GhcRtsCcOpts)
 SRC_HC_OPTS += $(GhcRtsHcOpts)
@@ -105,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,$(GhcHcOpts)))" ""
+PACKAGE_CPP_OPTS += -DDEBUG -DUSING_LIBBFD
+endif
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?