[commit: integer-gmp] master: Tweak build rules (5f01243)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/integer-gmp

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5f01243d076db83f6e2b97dd3219d62dc78e3023

>---------------------------------------------------------------

commit 5f01243d076db83f6e2b97dd3219d62dc78e3023
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri Apr 22 12:50:34 2011 +0100

    Tweak build rules
    
    We were doing
        echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'
    but the only x86 value HOSTPLATFORM can have is i386.
    
    We now also tell GMP that its build platform is $(BUILDPLATFORM)
    rather than $(HOSTPLATFORM).

>---------------------------------------------------------------

 gmp/ghc.mk |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gmp/ghc.mk b/gmp/ghc.mk
index 96a814f..d3962cd 100644
--- a/gmp/ghc.mk
+++ b/gmp/ghc.mk
@@ -100,8 +100,6 @@ libraries/integer-gmp_dist-install_EXTRA_OBJS += libraries/integer-gmp/gmp/objs/
 endif
 endif
 
-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.
@@ -132,7 +130,8 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h:
 	    export PATH; \
 	    cd gmpbuild && \
 	    CC=$(WhatGccIsCalled) NM=$(NM) AR=$(AR) $(SHELL) configure \
-	          --enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
+	          --enable-shared=no \
+	          --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
 	$(MAKE) -C libraries/integer-gmp/gmp/gmpbuild MAKEFLAGS=
 	$(CP) libraries/integer-gmp/gmp/gmpbuild/gmp.h libraries/integer-gmp/gmp/
 	$(CP) libraries/integer-gmp/gmp/gmpbuild/.libs/libgmp.a libraries/integer-gmp/gmp/
@@ -151,7 +150,8 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h:
 #	    export PATH; \
 #	    cd gmpbuild-shared && \
 #	    CC=$(WhatGccIsCalled) $(SHELL) configure \
-#	          --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
+#	          --enable-shared=yes --disable-static \
+#	          --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
 #	touch $@
 #
 #gmp.h: stamp.gmp.static