Commit 3584bd42 authored by Dario Bertini's avatar Dario Bertini Committed by Ben Gamari

circleci: Actually build with in-tree GMP on Darwin

Fixes #15404.
parent d0fc7618
......@@ -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:
......
......@@ -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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment