X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=6cb4e0a32e54d53e479d025ef0ef6ed56b50732b;hb=50027272414438955dbc41696541cbd25da55883;hp=d1355f0e8654eba0d58cddcd47239958f7655167;hpb=32be5922dd5625a0771b6ae40ab111ae625044f3;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index d1355f0..6cb4e0a 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.40 2000/11/07 16:24:25 simonmar Exp $
+# $Id: Makefile,v 1.44 2001/03/23 16:36:21 simonmar Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -32,13 +32,13 @@ else
 SRCS_RTS_C  := $(filter-out Main.c, $(SRCS_RTS_C))
 endif
 
-#-----------------------------------------------------------------------------
-# creating and installing libHSrts.a (in its many flavors)
-#
 LIBOBJS = $(patsubst %.c,%.$(way_)o,$(SRCS_RTS_C)) \
           $(patsubst %.hc,%.$(way_)o,$(SRCS_RTS_HC)) \
           $(patsubst %.S,%.$(way_)o,$(SRCS_RTS_S))
 
+#-----------------------------------------------------------------------------
+# Flags for compiling RTS .c and .hc files
+
 # gcc provides lots of useful warnings if you ask it.
 # This is a pretty good list to start with - use a # to comment out
 # any you don't like.
@@ -60,7 +60,6 @@ WARNING_OPTS += -optc-Wbad-function-cast
 #WARNING_OPTS += -optc-Wconversion
 
 SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
-SRC_CC_OPTS = $(GhcRtsCcOpts)
 
 ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
@@ -71,20 +70,23 @@ ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
+# compiling straight C files: use all the HC_OPTS, plus any extra options in
+# $(GhcRtsCcOpts).
+SRC_CC_OPTS += $(GhcRtsCcOpts)
+SRC_CC_OPTS += $(HC_OPTS)
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
+SRCS_RTS_C :=  $(filter-out Vis%.c, $(SRCS_RTS_C))
+
 # we need GTK+ for the front panel
 ifneq "$(GTK_CONFIG)" ""
-
 ifeq "$(GhcRtsWithFrontPanel)" "YES"
-SRC_HC_OPTS += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
-else
-SRCS_RTS_C :=  $(filter-out Vis%.c, $(SRCS_RTS_C))
-endif
-
-VisCallbacks_CC_OPTS = -optc-Wno-unused
-
+SRC_HC_OPTS 		+= `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
+SRCS_RTS_C 		:= $(SRCS_RTS_C) $(wildcard Vis*.c)
+VisCallbacks_CC_OPTS 	+= -optc-Wno-unused
+endif # GhcRtsWithFrontPanel
 endif # GTK_CONFIG
 
 #-----------------------------------------------------------------------------
@@ -102,7 +104,16 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 # ../driver/ghc (a better C compiler :-) to compile the
 # different RTS pieces
 #
-CC=$(GHC_INPLACE) $(HC_OPTS) $($*_HC_OPTS)
+
+ifeq "$(BootingFromHc)" "YES"
+# use the normal $(CC) when booting from .hc files
+SRC_CC_OPTS := $(patsubst -optc%,%,$(SRC_CC_OPTS))
+SRC_CC_OPTS += $(PLATFORM_CC_OPTS)
+else
+# otherwise, use $(GHC_INPLACE) as the C compiler.
+CC=$(GHC_INPLACE)
+endif
+
 HC=$(GHC_INPLACE)
 
 # prevent this value from leaking into the GMP makefile