[commit: ghc] master: circleci: Build with in-tree GMP on Darwin (78fb310)

git at git.haskell.org git at git.haskell.org
Mon Oct 29 19:13:01 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/78fb31077e58d949ea644c9d51abe53de9a9d2cb/ghc

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

commit 78fb31077e58d949ea644c9d51abe53de9a9d2cb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Oct 17 15:31:36 2018 -0400

    circleci: Build with in-tree GMP on Darwin
    
    Fixes #15404.
    
    (cherry picked from commit 578012be13eb1548050d51c0a23bd1a98423f03e)


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

78fb31077e58d949ea644c9d51abe53de9a9d2cb
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53962c9..02c151d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,7 +35,7 @@ aliases:
   - &configure_unix
     run:
       name: Configure
-      command: ./configure
+      command: ./configure $CONFIGURE_OPTS
   - &configure_unix_32
     run:
       name: Configure
@@ -144,6 +144,8 @@ 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



More information about the ghc-commits mailing list