integer-gmp: Simplify gmp/configure invocation
authorBen Gamari <bgamari.foss@gmail.com>
Fri, 2 Feb 2018 18:58:14 +0000 (13:58 -0500)
committerBen Gamari <ben@smart-cactus.org>
Sat, 3 Feb 2018 21:01:20 +0000 (16:01 -0500)
There weas lots of historical cruft to be found here. The `export
SHELLOPTS` breaks on NixOS due to bash syntax in the gcc wrapper script.

Reviewers: hvr

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4347

(cherry picked from commit 3441b1455bf9f2e7cc9e064e3edae3607c70a1c0)

libraries/integer-gmp/gmp/ghc.mk

index 8a74f76..794942c 100644 (file)
@@ -130,10 +130,7 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h:
        # Note: We must pass `TARGETPLATFORM` to the `--host` argument of GMP's
        #       `./configure`, not `HOSTPLATFORM`: the 'host' on which GMP will
        #       run is the 'target' platform of the compiler we're building.
-       cd libraries/integer-gmp/gmp; (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
-           PATH=`pwd`:$$PATH; \
-           export PATH; \
-           cd gmpbuild && \
+       cd libraries/integer-gmp/gmp/gmpbuild; \
            CC=$(CCX) NM=$(NM) AR=$(AR_STAGE1) ./configure \
                  --enable-shared=no \
                  --host=$(TARGETPLATFORM) --build=$(BUILDPLATFORM)