X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=gmp%2FMakefile;fp=gmp%2FMakefile;h=9822ead85d167e397b27b7e302a550b8706b0287;hp=18d0b75049e2f5287a73840e7119d132e8284c63;hb=d37d720f79f3269be95f3662a11009e6834023f6;hpb=d6f574556d5529faf0d314e5aef06f90c799e44f

diff --git a/gmp/Makefile b/gmp/Makefile
index 18d0b75..9822ead 100644
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -12,7 +12,7 @@ include $(TOP)/mk/boilerplate.mk
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkGMP)" "YES"
 
-boot :: stamp.gmp
+boot :: stamp.gmp.static
 
 PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 
@@ -35,7 +35,13 @@ GMP_TARBALL := $(firstword $(wildcard gmp*.tar.gz))
 GMP_DIR := $(subst .tar.gz,,$(GMP_TARBALL))
 BMP_BUILD_DIR := build
 
-stamp.gmp:
+ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
+BUILD_SHARED=yes
+else
+BUILD_SHARED=no
+endif
+
+stamp.gmp.static:
 	$(RM) -rf $(GMP_DIR) gmpbuild
 	$(TAR) -zxf $(GMP_TARBALL)
 	mv $(GMP_DIR) gmpbuild
@@ -47,42 +53,51 @@ stamp.gmp:
 	          --enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
 	touch $@
 
-all :: gmpbuild/libgmp.a
+stamp.gmp.shared:
+	$(RM) -rf $(GMP_DIR) gmpbuild-shared
+	$(TAR) -zxf $(GMP_TARBALL)
+	mv $(GMP_DIR) gmpbuild-shared
+	chmod +x ln
+	set -o igncr; export SHELLOPTS; \
+	    export PATH=`pwd`:$$PATH; \
+	    cd gmpbuild-shared && \
+	    CC=$(WhatGccIsCalled) $(SHELL) configure \
+	          --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
+	touch $@
 
-ifeq "$(DLLized)" "YES"
-all :: $(DLL_PEN)/gmp.dll
+libgmp.a: stamp.gmp.static
+	$(MAKE) -C gmpbuild MAKEFLAGS=
+	$(CP) gmpbuild/.libs/libgmp.a .
+	$(RANLIB) libgmp.a
 
-$(DLL_PEN)/gmp.dll:
-	$(MAKE) -C gmpbuild gmp.dll
-	$(CP) gmpbuild/gmp.dll $(DLL_PEN)
-endif
+all :: libgmp.a
 
-install :: gmpbuild/libgmp.a
+install :: libgmp.a
 
 INSTALL_LIBS += gmpbuild/libgmp.a
 
-gmpbuild/libgmp.a ::
-	$(MAKE) -C gmpbuild MAKEFLAGS=
-	$(CP) gmpbuild/.libs/libgmp.a gmpbuild
-	$(RANLIB) gmpbuild/libgmp.a
+ifeq "$(BUILD_SHARED)" "yes"
+libgmp-3.dll: stamp.gmp.shared
+	$(MAKE) -C gmpbuild-shared MAKEFLAGS=
+	$(CP) gmpbuild-shared/.libs/libgmp-3.dll .
+
+libgmp.dll.a: libgmp-3.dll
+	$(CP) gmpbuild-shared/.libs/libgmp.dll.a .
+
+all :: libgmp-3.dll libgmp.dll.a
+
+install :: libgmp-3.dll libgmp.dll.a
+
+INSTALL_LIBS += libgmp.dll.a
+INSTALL_PROGS += libgmp-3.dll
+endif
 endif
 endif
 
 clean distclean maintainer-clean ::
-	$(RM) -f stamp.gmp
-	$(RM) -rf gmpbuild
+	$(RM) -f stamp.gmp.static stamp.gmp.shared
 	$(RM) -rf gmpbuild
-
-#-----------------------------------------------------------------------------
-#
-# Files to install
-#
-# Just libHSrts is installed uniformly across ways
-#
-ifeq "$(DLLized)" "YES"
-INSTALL_PROGS += gmpbuild/gmp.dll
-INSTALL_LIBS += gmpbuild/libgmp_imp.a
-endif
+	$(RM) -rf gmpbuild-shared
 
 #-----------------------------------------------------------------------------
 #