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:03:11 -0500 |
| commit | b6d2d8375e4c1425690e26d1f6bc1578f7ed1043 (patch) | |
| tree | e57230370feb8a40b6eef89a8143d033264172f6 | |
| parent | 4519d98d5399c2a958b2592b0ab50d89980d48b5 (diff) | |
| download | haskell-b6d2d8375e4c1425690e26d1f6bc1578f7ed1043.tar.gz | |
circleci: Actually build with in-tree GMP on Darwin
Fixes #15404.
(cherry picked from commit 3584bd4255eb59be043252c9b4ef16bcbd835c9b)
| -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 441435727f..6dcb218770 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 636b792c82..7d8cac60a2 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" |