[commit: ghc] master: integer-gmp: Simplify gmp/configure invocation (3441b14)

git at git.haskell.org git at git.haskell.org
Sat Feb 3 02:58:51 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3441b1455bf9f2e7cc9e064e3edae3607c70a1c0/ghc

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

commit 3441b1455bf9f2e7cc9e064e3edae3607c70a1c0
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Feb 2 13:58:14 2018 -0500

    integer-gmp: Simplify gmp/configure invocation
    
    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


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

3441b1455bf9f2e7cc9e064e3edae3607c70a1c0
 libraries/integer-gmp/gmp/ghc.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/integer-gmp/gmp/ghc.mk b/libraries/integer-gmp/gmp/ghc.mk
index 8a74f76..794942c 100644
--- a/libraries/integer-gmp/gmp/ghc.mk
+++ b/libraries/integer-gmp/gmp/ghc.mk
@@ -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)



More information about the ghc-commits mailing list