projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-02-04 12:23:02 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Makefile
diff --git
a/ghc/rts/Makefile
b/ghc/rts/Makefile
index
4d95ac4
..
17b16ec
100644
(file)
--- a/
ghc/rts/Makefile
+++ b/
ghc/rts/Makefile
@@
-1,5
+1,5
@@
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.59 2002/01/30 16:27:34 simonmar Exp $
+# $Id: Makefile,v 1.62 2002/02/04 12:23:02 simonmar Exp $
#
# This is the Makefile for the runtime-system stuff.
# This stuff is written in C (and cannot be written in Haskell).
#
# This is the Makefile for the runtime-system stuff.
# This stuff is written in C (and cannot be written in Haskell).
@@
-45,7
+45,7
@@
EXCLUDED_SRCS += parallel/SysMan.c
# The build system doesn't give us these
HC_SRCS = $(filter %.hc, $(SRCS))
# The build system doesn't give us these
HC_SRCS = $(filter %.hc, $(SRCS))
-HC_OBJS = $(patsubst %.hc,%.o, $(HC_SRCS))
+HC_OBJS = $(patsubst %.hc,%.$(way)_o, $(HC_SRCS))
# Override the default $(LIBOBJS) (the default provides for building Haskell libs)
LIBOBJS = $(C_OBJS) $(HC_OBJS)
# Override the default $(LIBOBJS) (the default provides for building Haskell libs)
LIBOBJS = $(C_OBJS) $(HC_OBJS)
@@
-75,13
+75,16
@@
WARNING_OPTS += -Wcast-align
#WARNING_OPTS += -Wredundant-decls
#WARNING_OPTS += -Wconversion
#WARNING_OPTS += -Wredundant-decls
#WARNING_OPTS += -Wconversion
+# 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_CC_OPTS += $(WARNING_OPTS)
-SRC_CC_OPTS += -I../includes -I. -Iparallel
-SRC_HC_OPTS += -I../includes -I. -Iparallel
+SRC_HC_OPTS += -I../includes -I. -Iparallel -DCOMPILING_RTS
-SRC_CC_OPTS += $(GhcRtsCcOpts) -DCOMPILING_RTS
-SRC_HC_OPTS += $(GhcRtsHcOpts) -DCOMPILING_RTS
+SRC_CC_OPTS += $(GhcRtsCcOpts)
+SRC_HC_OPTS += $(GhcRtsHcOpts)
ifneq "$(DLLized)" "YES"
SRC_HC_OPTS += -static
ifneq "$(DLLized)" "YES"
SRC_HC_OPTS += -static
@@
-97,6
+100,14
@@
ifeq "$(BootingFromHc)" "YES"
SRC_CC_OPTS += $(HC_OPTS)
endif
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
+endif
+endif
+
#-----------------------------------------------------------------------------
# Include the Front panel code?
#-----------------------------------------------------------------------------
# Include the Front panel code?