Update the in-tree GMP; fixes trac #832

[ghc-hetmet.git] / rts / Makefile

diff --git a/rts/Makefile b/rts/Makefile
index 08240a1..2c5dcc4 100644 (file)
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -7,9 +7,6 @@
 #  .hc files are "Haskellized-C", compiled using the C compiler and
 #      (possibly) the assembly-mangler.  The GHC driver script
 #      knows how to compile this stuff.
-#
-#  Other sorta independent, compile-once subdirs are:
-#      gmp             -- GNU multi-precision library (for Integer)
 
 #-----------------------------------------------------------------------------
 # Preamble
@@ -35,7 +32,7 @@ WAYS=$(GhcLibWays) $(GhcRTSWays)
 
 ifneq "$(findstring debug, $(way))" ""
 GhcRtsHcOpts=
-GhcRtsCcOpts=-g
+GhcRtsCcOpts=-g -O0
 endif
 
 # -----------------------------------------------------------------------------
@@ -96,7 +93,7 @@ WARNING_OPTS += -Wmissing-declarations
 WARNING_OPTS += -Winline
 WARNING_OPTS += -Waggregate-return
 #WARNING_OPTS += -Wpointer-arith
-WARNING_OPTS += -Wbad-function-cast
+#WARNING_OPTS += -Wbad-function-cast
 #WARNING_OPTS += -Wcast-align
 #WARNING_OPTS += -Wnested-externs
 #WARNING_OPTS += -Wshadow
@@ -144,6 +141,10 @@ ifeq "$(HaveLibMingwEx)" "YES"
 PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
 endif
 
+ifeq "$(GhciWithDebugger)" "YES"
+STANDARD_OPTS += -DDEBUGGER
+endif
+
 ifeq "$(DotnetSupport)" "YES"
 
 # 
@@ -181,8 +182,8 @@ endif
 #-----------------------------------------------------------------------------
 # Add PAPI library if needed
 
-ifeq "$(USE_PAPI)" "YES"
-SRC_HC_OPTS            += -lpapi -optc-DUSE_PAPI
+ifeq "$(GhcRtsWithPapi)" "YES"
+SRC_HC_OPTS            += -optc-DUSE_PAPI
 PACKAGE_CPP_OPTS       += -DUSE_PAPI
 endif
 
@@ -203,6 +204,8 @@ SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
 # We want a slightly different version for the unregisterised way, so we make
 # AutoApply on a per-way basis (eg. AutoApply_p.cmm).
 
+ifneq "$(DOING_BIN_DIST)" "YES"
+
 AUTO_APPLY_CMM = AutoApply$(_way).cmm
 
 ifneq "$(BootingFromHc)" "YES"
@@ -215,6 +218,8 @@ EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM)
 
 CLEAN_FILES += $(AUTO_APPLY_CMM)
 
+endif
+
 # -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.
@@ -246,47 +251,30 @@ endif
 # We use GMP's own configuration stuff, because it's all rather hairy
 # and not worth re-implementing in our Makefile framework.
 
-ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkGMP)" "YES"
-boot ::
-       if [ -f gmp/config.status ]; then \
-          cd gmp && CC=$(WhatGccIsCalled) ./config.status; \
-        else \
-          cd gmp && CC=$(WhatGccIsCalled) $(SHELL) configure --enable-shared=no \
-                       --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \
-       fi
-
-# Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc.
-
-ifeq "$(way)" ""
-all :: gmp/libgmp.a
-
-ifeq "$(DLLized)" "YES"
-all :: $(DLL_PEN)/gmp.dll
-
-$(DLL_PEN)/gmp.dll:
-       $(MAKE) -C gmp gmp.dll
-       $(MV) gmp/gmp.dll $(DLL_PEN)
-endif
-endif
+CLEAN_FILES += gmp/libgmp.a
 
-install :: gmp/libgmp.a
+# Need to get the GMP vars in through CPP to package.conf.in, and put
+# quotes around each element.
 
-ifeq "$(way)" ""
-clean distclean maintainer-clean ::
-       -$(MAKE) -C gmp MAKEFLAGS= $@
+empty =
+space = $(empty) $(empty)
+comma = ,
+PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))'
+PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))'
 
-INSTALL_LIBS += gmp/libgmp.a
-endif
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+SRC_HC_OPTS += -I$(GMP_INCLUDE_DIRS)
+SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
+SRC_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS)
 endif
-
-gmp/libgmp.a ::
-       $(MAKE) -C gmp MAKEFLAGS=
-       @$(CP) gmp/.libs/libgmp.a gmp
-       @$(RANLIB) gmp/libgmp.a
+ifneq "$(GMP_LIB_DIRS)" ""
+SRC_LD_OPTS += -L$(GMP_LIB_DIRS)
 endif
 
-CLEAN_FILES += gmp/libgmp.a
+SRC_CC_OPTS += -I../gmp/gmpbuild
+SRC_HC_OPTS += -I../gmp/gmpbuild
+SRC_HSC2HS_OPTS += -I../gmp/gmpbuild
+SRC_LD_OPTS += -L../gmp/gmpbuild
 
 #-----------------------------------------------------------------------------
 #
@@ -367,11 +355,25 @@ endif
 #
 # Just libHSrts is installed uniformly across ways
 #
-INSTALL_LIBS += $(LIBRARY)
 ifeq "$(DLLized)" "YES"
-INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
-INSTALL_LIBS += $(patsubst %.a,%_imp.a,$(LIBARY))
+INSTALL_PROGS += gmp/gmp.dll
 INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
 endif
 
+#-----------------------------------------------------------------------------
+#
+# binary-dist
+
 include $(TOP)/mk/target.mk
+
+binary-dist:
+       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/rts
+       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/rts/gmp
+       $(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/rts/
+       $(INSTALL_DATA)    package.conf.in     $(BIN_DIST_DIR)/rts/
+ifneq "$(INSTALL_LIBS)" ""
+       $(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/rts/
+endif
+ifneq "$(INSTALL_LIBEXECS)" ""
+       $(INSTALL_PROGRAM) $(INSTALL_LIBEXECS) $(BIN_DIST_DIR)/rts/
+endif