X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=gmp%2FMakefile;h=8f2097c1057ffbb4bd1893da7eefe14f5a3e60e0;hp=18d0b75049e2f5287a73840e7119d132e8284c63;hb=f5edc6b0871a0debbc9a64f4cdb95c0dc35e5b16;hpb=fdf1cd0399158308769fcb2ab7e46e215a68d865

diff --git a/gmp/Makefile b/gmp/Makefile
index 18d0b75..8f2097c 100644
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -12,10 +12,13 @@ include $(TOP)/mk/boilerplate.mk
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkGMP)" "YES"
 
-boot :: stamp.gmp
-
 PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 
+# 2007-09-26
+#     set -o igncr 
+# is not a valid command on non-Cygwin-systems.
+# Let it fail silently instead of aborting the build.
+#
 # 2007-07-05
 # We do
 #     set -o igncr; export SHELLOPTS
@@ -33,55 +36,78 @@ PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 
 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
+
+boot :: stamp.gmp.static
+BINDIST_STAMPS = stamp.gmp.static
+INSTALL_HEADERS += gmp.h
+INSTALL_LIBS += libgmp.a
+
+ifeq "$(BUILD_SHARED)" "yes"
+boot :: stamp.gmp.shared
+BINDIST_STAMPS += stamp.gmp.shared
+INSTALL_LIBS += libgmp.dll.a
+INSTALL_PROGS += libgmp-3.dll
+endif
+
+install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS)
+
+stamp.gmp.static:
 	$(RM) -rf $(GMP_DIR) gmpbuild
 	$(TAR) -zxf $(GMP_TARBALL)
 	mv $(GMP_DIR) gmpbuild
 	chmod +x ln
-	set -o igncr; export SHELLOPTS; \
-	    export PATH=`pwd`:$$PATH; \
+	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
+	    PATH=`pwd`:$$PATH; \
+	    export PATH; \
 	    cd gmpbuild && \
 	    CC=$(WhatGccIsCalled) $(SHELL) configure \
 	          --enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
 	touch $@
 
-all :: gmpbuild/libgmp.a
-
-ifeq "$(DLLized)" "YES"
-all :: $(DLL_PEN)/gmp.dll
+stamp.gmp.shared:
+	$(RM) -rf $(GMP_DIR) gmpbuild-shared
+	$(TAR) -zxf $(GMP_TARBALL)
+	mv $(GMP_DIR) gmpbuild-shared
+	chmod +x ln
+	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
+	    PATH=`pwd`:$$PATH; \
+	    export PATH; \
+	    cd gmpbuild-shared && \
+	    CC=$(WhatGccIsCalled) $(SHELL) configure \
+	          --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
+	touch $@
 
-$(DLL_PEN)/gmp.dll:
-	$(MAKE) -C gmpbuild gmp.dll
-	$(CP) gmpbuild/gmp.dll $(DLL_PEN)
-endif
+gmp.h: stamp.gmp.static
+	$(CP) gmpbuild/gmp.h .
 
-install :: gmpbuild/libgmp.a
+libgmp.a: stamp.gmp.static
+	$(MAKE) -C gmpbuild MAKEFLAGS=
+	$(CP) gmpbuild/.libs/libgmp.a .
+	$(RANLIB) libgmp.a
 
-INSTALL_LIBS += gmpbuild/libgmp.a
+libgmp-3.dll: stamp.gmp.shared
+	$(MAKE) -C gmpbuild-shared MAKEFLAGS=
+	$(CP) gmpbuild-shared/.libs/libgmp-3.dll .
 
-gmpbuild/libgmp.a ::
-	$(MAKE) -C gmpbuild MAKEFLAGS=
-	$(CP) gmpbuild/.libs/libgmp.a gmpbuild
-	$(RANLIB) gmpbuild/libgmp.a
+libgmp.dll.a: libgmp-3.dll
+	$(CP) gmpbuild-shared/.libs/libgmp.dll.a .
 endif
 endif
 
+# GMP takes a long time to build, but changes rarely.  Hence we don't
+# bother cleaning it before validating, because that adds a
+# significant overhead to validation.
+ifeq "$(Validating)" "NO"
 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
+	$(RM) -rf gmpbuild-shared
 endif
 
 #-----------------------------------------------------------------------------
@@ -91,20 +117,20 @@ endif
 include $(TOP)/mk/target.mk
 
 binary-dist:
-	@:
-ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkGMP)" "YES"
 	$(INSTALL_DIR)                         $(BIN_DIST_DIR)/gmp
-	$(INSTALL_DIR)                         $(BIN_DIST_DIR)/gmp/gmpbuild
-	touch $(BIN_DIST_DIR)/gmp/$(GMP_TARBALL)
 	$(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/gmp/
-ifneq "$(INSTALL_PROGS)" ""
-	$(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/gmp/gmpbuild/
-endif
-ifneq "$(INSTALL_LIBS)" ""
-	$(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/gmp/gmpbuild/
-endif
-
-endif
+ifneq "$(HaveLibGmp)" "YES"
+ ifneq "$(HaveFrameworkGMP)" "YES"
+	$(INSTALL_DATA)    $(BINDIST_STAMPS)   $(BIN_DIST_DIR)/gmp/
+  ifneq "$(INSTALL_PROGS)" ""
+	$(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/gmp/
+  endif
+  ifneq "$(INSTALL_LIBS)" ""
+	$(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/gmp/
+  endif
+  ifneq "$(INSTALL_HEADERS)" ""
+	$(INSTALL_HEADER)  $(INSTALL_HEADERS)  $(BIN_DIST_DIR)/gmp/
+  endif
+ endif
 endif