diff options
| author | Dario Bertini <berdario@google.com> | 2018-11-16 10:25:32 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-11-22 16:02:23 -0500 |
| commit | 3584bd4255eb59be043252c9b4ef16bcbd835c9b (patch) | |
| tree | 766d8384836a4f8b4634da9332f71a31f75803a6 /.circleci | |
| parent | d0fc76189b9b709378849d071814342983c3a5df (diff) | |
| download | haskell-3584bd4255eb59be043252c9b4ef16bcbd835c9b.tar.gz | |
circleci: Actually build with in-tree GMP on Darwin
Fixes #15404.
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rwxr-xr-x | .circleci/prepare-system.sh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index f80b2b321b..5e49cde2c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ aliases: - &configure_unix run: name: Configure - command: ./configure $CONFIGURE_OPTS + command: ./configure - &configure_unix_32 run: name: Configure @@ -162,8 +162,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 TEST_ENV: x86_64-darwin steps: diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh index dbb1011df5..4be1b64a6f 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" |