[commit: ghc] ghc-8.6: circleci: Actually build with in-tree GMP on Darwin (b6d2d83)

[git at git.haskell.org]

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

On branch  : ghc-8.6
Link       : http://ghc.haskell.org/trac/ghc/changeset/b6d2d8375e4c1425690e26d1f6bc1578f7ed1043/ghc

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

commit b6d2d8375e4c1425690e26d1f6bc1578f7ed1043
Author: Dario Bertini <berdario at google.com>
Date:   Fri Nov 16 10:25:32 2018 +0100

    circleci: Actually build with in-tree GMP on Darwin
    
    Fixes #15404.
    
    (cherry picked from commit 3584bd4255eb59be043252c9b4ef16bcbd835c9b)


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

b6d2d8375e4c1425690e26d1f6bc1578f7ed1043
 .circleci/config.yml        | 4 +---
 .circleci/prepare-system.sh | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4414357..6dcb218 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ aliases:
   - &configure_unix
     run:
       name: Configure
-      command: ./configure $CONFIGURE_OPTS
+      command: ./configure 
   - &configure_unix_32
     run:
       name: Configure
@@ -140,8 +140,6 @@ jobs:
       # Only Sierra and onwards supports clock_gettime. See #12858
       ac_cv_func_clock_gettime: "no"
       GHC_COLLECTOR_FLAVOR: x86_64-darwin
-      # Build with in-tree GMP since this isn't available on OS X by default.
-      CONFIGURE_OPTS: --with-intree-gmp
       <<: *buildenv
     steps:
       - checkout
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index 636b792..7d8cac6 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -69,6 +69,7 @@ case "$(uname)" in
     ln -s $HOME/.cabal/bin/alex /usr/local/bin/alex || true
     ln -s $HOME/.cabal/bin/happy /usr/local/bin/happy || true
     ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour || true
+    echo "libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp" >> mk/build.mk
     ;;
   *)
     fail "uname=$(uname) not supported"