[commit: ghc] wip/revert-intree-gmp-flag: Revert "Update Darwin CI to use new toplevel --with-intree-gmp configure flag" (e1fb612)

git at git.haskell.org git at git.haskell.org
Sun Jan 27 13:33:31 UTC 2019


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

On branch  : wip/revert-intree-gmp-flag
Link       : http://ghc.haskell.org/trac/ghc/changeset/e1fb612827d7cb405c72d9c63f4259b00e943840/ghc

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

commit e1fb612827d7cb405c72d9c63f4259b00e943840
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jan 26 20:33:38 2019 -0500

    Revert "Update Darwin CI to use new toplevel --with-intree-gmp configure flag"
    
    This reverts commit cd45f8c471bb6901ac89babe98fca8e81f430d26.


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

e1fb612827d7cb405c72d9c63f4259b00e943840
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d739eff..2d5a9d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,7 +119,6 @@ validate-x86_64-darwin:
     # Only Sierra and onwards supports clock_gettime. See #12858
     ac_cv_func_clock_gettime: "no"
     LANG: "en_US.UTF-8"
-    CONFIGURE_ARGS: --with-intree-gmp
   before_script:
     - git clean -xdf && git submodule foreach git clean -xdf
     - python3 .gitlab/fix-submodules.py
@@ -129,6 +128,7 @@ validate-x86_64-darwin:
 
     - bash .gitlab/darwin-init.sh
     - PATH="`pwd`/toolchain/bin:$PATH"
+    - echo "libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp" >> mk/build.mk
   after_script:
     - cp -Rf $HOME/.cabal cabal-cache
   artifacts:



More information about the ghc-commits mailing list