Use Cabal to build pwd

[ghc-hetmet.git] / gmp / Makefile

diff --git a/gmp/Makefile b/gmp/Makefile
index ab661d9..f194f66 100644 (file)
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -36,7 +36,6 @@ 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
 
 ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
 BUILD_SHARED=yes
@@ -44,13 +43,11 @@ 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
@@ -64,7 +61,8 @@ stamp.gmp.static:
        mv $(GMP_DIR) gmpbuild
        chmod +x ln
        (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
-           export PATH=`pwd`:$$PATH; \
+           PATH=`pwd`:$$PATH; \
+           export PATH; \
            cd gmpbuild && \
            CC=$(WhatGccIsCalled) $(SHELL) configure \
                  --enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
@@ -76,7 +74,8 @@ stamp.gmp.shared:
        mv $(GMP_DIR) gmpbuild-shared
        chmod +x ln
        (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
-           export PATH=`pwd`:$$PATH; \
+           PATH=`pwd`:$$PATH; \
+           export PATH; \
            cd gmpbuild-shared && \
            CC=$(WhatGccIsCalled) $(SHELL) configure \
                  --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)