X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FMakefile;h=d9d9a762ebcdd46512a2a4215a7e190fdef0741a;hb=6ea86573500e4a576d22feec71e36cf27c94aaa9;hp=317fa8f6742bc74b00059064dc566bf114a1c437;hpb=813ab8ac65cd916ed012da95080b3ab6658e014f;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 317fa8f..d9d9a76 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.46 2001/04/04 14:31:30 rrt Exp $
+# $Id: Makefile,v 1.52 2001/07/05 13:01:16 rrt Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -80,7 +80,7 @@ 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` -DRTS_GTK_FRONTPANEL
+SRC_HC_OPTS 		+= `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
 SRCS_RTS_C 		:= $(SRCS_RTS_C) $(wildcard Vis*.c)
 VisCallbacks_CC_OPTS 	+= -Wno-unused
 endif # GhcRtsWithFrontPanel
@@ -104,8 +104,7 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 
 ifeq "$(BootingFromHc)" "YES"
 # use the normal $(CC) when booting from .hc files
-SRC_CC_OPTS := $(SRC_CC_OPTS)
-SRC_CC_OPTS += $(PLATFORM_CC_OPTS) $(HC_OPTS)
+SRC_CC_OPTS += $(HC_OPTS)
 else
 # otherwise, use $(GHC_INPLACE) as the C compiler.
 CC=$(GHC_INPLACE)
@@ -121,7 +120,7 @@ unexport CC
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 #
-HSLIB             = rts
+PACKAGE             = rts
 
 ifeq "$(DLLized)" "YES"
 SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
@@ -153,13 +152,16 @@ endif
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 boot ::
-	cd gmp && ./configure --enable-shared=no
+	cd gmp && ./configure --enable-shared=no \
+		--host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`
 else
+# Pass --target to configure of GMP, so that building for mingwin under
+# cygwin works properly (when the host is not the same as the target)
 boot ::
-	cd gmp && ./configure --enable-shared=no --target=$(HOSTPLATFORM)
+	cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no --target=$(HOSTPLATFORM)
 endif
 
-# Slight cheatage here to past host as target, but x-compilation isn't supported by ghc.
+# Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc.
 
 all :: gmp/libgmp.a
 
@@ -173,8 +175,8 @@ endif
 
 install :: gmp/libgmp.a
 
-clean ::
-	$(MAKE) -C gmp MAKEFLAGS= clean
+clean distclean maintainer-clean ::
+	$(MAKE) -C gmp MAKEFLAGS= $@
 
 ifeq "$(way)" ""
 INSTALL_LIBS += gmp/libgmp.a