[commit: ghc] wip/fix-docs: Try fixing OS X build (b799fa0)

git at git.haskell.org git at git.haskell.org
Wed Aug 8 19:54:25 UTC 2018


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

On branch  : wip/fix-docs
Link       : http://ghc.haskell.org/trac/ghc/changeset/b799fa04f5e33f0f981df57986dc0800bfdd8afc/ghc

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

commit b799fa04f5e33f0f981df57986dc0800bfdd8afc
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Aug 8 14:22:23 2018 -0400

    Try fixing OS X build


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

b799fa04f5e33f0f981df57986dc0800bfdd8afc
 .circleci/config.yml | 2 +-
 libraries/Cabal      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a2b3478..ec085b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -135,7 +135,7 @@ jobs:
     environment:
       # Disable sphinx PDF output as MacTeX apparently doesn't provide xelatex
       BUILD_SPHINX_PDF: "NO"
-      MACOSX_DEPLOYMENT_TARGET: "10.7"
+      #MACOSX_DEPLOYMENT_TARGET: "10.7"
       # Only Sierra and onwards supports clock_gettime. See #12858
       ac_cv_func_clock_gettime: "no"
       GHC_COLLECTOR_FLAVOR: x86_64-darwin
diff --git a/libraries/Cabal b/libraries/Cabal
index 5ed4d20..fe10982 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 5ed4d20ea5101a82254c025d16477c33489e0a0d
+Subproject commit fe10982db1f2fa7d828fc5f8ddaa5beedceaddec



More information about the ghc-commits mailing list