circleci: Actually build with in-tree GMP on Darwin
authorDario Bertini <berdario@google.com>
Fri, 16 Nov 2018 09:25:32 +0000 (10:25 +0100)
committerBen Gamari <ben@smart-cactus.org>
Thu, 22 Nov 2018 21:03:11 +0000 (16:03 -0500)
Fixes #15404.

(cherry picked from commit 3584bd4255eb59be043252c9b4ef16bcbd835c9b)

.circleci/config.yml
.circleci/prepare-system.sh

index 4414357..6dcb218 100644 (file)
@@ -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
index 636b792..7d8cac6 100755 (executable)
@@ -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"