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-11-09 09:58:56 by chak]
[ghc-hetmet.git]
/
ghc
/
rts
/
Makefile
diff --git
a/ghc/rts/Makefile
b/ghc/rts/Makefile
index
eb1fd0d
..
4f8c669
100644
(file)
--- a/
ghc/rts/Makefile
+++ b/
ghc/rts/Makefile
@@
-1,5
+1,4
@@
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.67 2002/02/14 15:11:28 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).
@@
-21,9
+20,7
@@
TOP=..
# set of suffix rules for compiling C code, using $(HC) rather than $(CC)
# and prepending "-optc" to $(CC_OPTS). NB. must be done before including
# boilerplate.mk below.
# set of suffix rules for compiling C code, using $(HC) rather than $(CC)
# and prepending "-optc" to $(CC_OPTS). NB. must be done before including
# boilerplate.mk below.
-ifneq "$(BootingFromHc)" "YES"
-UseGhcForCc = YES
-endif
+UseGhcForCc = $(shell if (test "x$(BootingFromHc)" = "xYES"); then echo NO; else echo YES; fi)
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/boilerplate.mk
@@
-34,15
+31,11
@@
WAYS=$(GhcLibWays)
PACKAGE = rts
# Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
PACKAGE = rts
# Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
-NON_HS_PKG = YES
+NON_HS_PACKAGE = YES
# grab sources from these subdirectories
ALL_DIRS = hooks parallel
# 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
ifneq "$(DLLized)" "YES"
EXCLUDED_SRCS += RtsDllMain.c
else
@@
-77,7
+70,7
@@
WARNING_OPTS += -Winline
WARNING_OPTS += -Waggregate-return
#WARNING_OPTS += -Wpointer-arith
WARNING_OPTS += -Wbad-function-cast
WARNING_OPTS += -Waggregate-return
#WARNING_OPTS += -Wpointer-arith
WARNING_OPTS += -Wbad-function-cast
-WARNING_OPTS += -Wcast-align
+#WARNING_OPTS += -Wcast-align
#WARNING_OPTS += -Wnested-externs
#WARNING_OPTS += -Wshadow
#WARNING_OPTS += -Wcast-qual
#WARNING_OPTS += -Wnested-externs
#WARNING_OPTS += -Wshadow
#WARNING_OPTS += -Wcast-qual
@@
-85,18
+78,16
@@
WARNING_OPTS += -Wcast-align
#WARNING_OPTS += -Wredundant-decls
#WARNING_OPTS += -Wconversion
#WARNING_OPTS += -Wredundant-decls
#WARNING_OPTS += -Wconversion
-STANDARD_OPTS+=-I../includes -I. -Iparallel -DCOMPILING_RTS
+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)
# 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)
-
-# Don't bother adding these to CC_OPTS; get them via HC_OPTS anyway.
-SRC_MKDEPENDC_OPTS += $(STANDARD_OPTS)
-
-SRC_HC_OPTS += $(STANDARD_OPTS)
+SRC_CC_OPTS += $(STANDARD_OPTS)
SRC_CC_OPTS += $(GhcRtsCcOpts)
SRC_HC_OPTS += $(GhcRtsHcOpts)
SRC_CC_OPTS += $(GhcRtsCcOpts)
SRC_HC_OPTS += $(GhcRtsHcOpts)
@@
-120,9
+111,19
@@
endif
ifeq "$(GhcRtsThreaded)" "YES"
ifeq "$(way)" ""
SRC_CC_OPTS += -DTHREADED_RTS
ifeq "$(GhcRtsThreaded)" "YES"
ifeq "$(way)" ""
SRC_CC_OPTS += -DTHREADED_RTS
+PACKAGE_CPP_OPTS += -DTHREADED_RTS
endif
endif
endif
endif
+# If -DDEBUG is in effect, adjust package conf accordingly..
+ifneq "$(strip $(filter -optc-DDEBUG,$(GhcRtsHcOpts)))" ""
+PACKAGE_CPP_OPTS += -DDEBUG
+endif
+
+ifeq "$(HaveLibMingwEx)" "YES"
+PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
+endif
+
#-----------------------------------------------------------------------------
# Include the Front panel code?
#-----------------------------------------------------------------------------
# Include the Front panel code?
@@
-176,6
+177,7
@@
endif
# and not worth re-implementing in our Makefile framework.
ifneq "$(HaveLibGmp)" "YES"
# and not worth re-implementing in our Makefile framework.
ifneq "$(HaveLibGmp)" "YES"
+ifneq "$(HaveFrameworkHaskellSupport)" "YES"
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
boot ::
cd gmp && ./configure --enable-shared=no \
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
boot ::
cd gmp && ./configure --enable-shared=no \
@@
-207,6
+209,7
@@
clean distclean maintainer-clean ::
INSTALL_LIBS += gmp/libgmp.a
endif
INSTALL_LIBS += gmp/libgmp.a
endif
+endif
gmp/libgmp.a ::
$(MAKE) -C gmp MAKEFLAGS=
gmp/libgmp.a ::
$(MAKE) -C gmp MAKEFLAGS=