From d9573df301bc1c88cc6cc110fee85b1248ef5ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mois=C3=A9s=20Ackerman?=
 <6054733+akrmn@users.noreply.github.com>
Date: Mon, 8 Nov 2021 19:52:27 +0100
Subject: [PATCH] Fix GHC build errors on macOS

    changelog_begin
    changelog_end
---
 ci/da-ghc-lib/compile.yml         | 2 +-
 ghc-lib/new-working-on-ghc-lib.md | 7 ++++++-
 stack-snapshot.yaml               | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ci/da-ghc-lib/compile.yml b/ci/da-ghc-lib/compile.yml
index a089c1e73f37..5e316193cdf4 100644
--- a/ci/da-ghc-lib/compile.yml
+++ b/ci/da-ghc-lib/compile.yml
@@ -12,7 +12,7 @@ jobs:
   variables:
     ghc-lib-sha: '42e5c306dcfbc84b83336fdd531023e93bfcc5b2'
     base-sha: '9c787d4d24f2b515934c8503ee2bbd7cfac4da20'
-    patches: 'e9abc24560f623c9c575d96a7a1a234927e042b2 833ca63be2ab14871874ccb6974921e8952802e9'
+    patches: '71fbb2da5199d7f96b943f133d03ff72252fbcbf 833ca63be2ab14871874ccb6974921e8952802e9'
     flavor: 'ghc-8.8.1'
   steps:
   - checkout: self
diff --git a/ghc-lib/new-working-on-ghc-lib.md b/ghc-lib/new-working-on-ghc-lib.md
index 0c81dca95535..54d82690c3b3 100644
--- a/ghc-lib/new-working-on-ghc-lib.md
+++ b/ghc-lib/new-working-on-ghc-lib.md
@@ -37,11 +37,16 @@ git checkout da-master-8.8.1
 git submodule update --init --recursive
 ```
 
-5. Made initial build (takes about 15 mins)
+5. Make initial build (takes about 15 mins)
 ```
 hadrian/build.stack.sh --configure --flavour=quickest -j
 ```
 
+Note: on macOS, you might get errors related to the Integer library GMP. Until those are fixed, adding `--integer-simple` to the flags above should allow you to build GHC.
+
+```
+hadrian/build.stack.sh --configure --flavour=quickest -j --integer-simple
+```
 
 ### Iterating on parser/desugaring in `ghc`
 
diff --git a/stack-snapshot.yaml b/stack-snapshot.yaml
index e61de270b197..2d3801e69f84 100644
--- a/stack-snapshot.yaml
+++ b/stack-snapshot.yaml
@@ -3,10 +3,10 @@
 
 resolver: lts-18.0
 packages:
-  - archive: https://daml-binaries.da-ext.net/da-ghc-lib/ghc-lib-be4506a37225265fc1e0dab696b43c04.tar.gz
-    sha256: "4e0d25b83c965eb51386c62f59157bc064aa556497068ab2fde2a09d40137403"
-  - archive: https://daml-binaries.da-ext.net/da-ghc-lib/ghc-lib-parser-be4506a37225265fc1e0dab696b43c04.tar.gz
-    sha256: "ae2d9ace0d92346f3c25bfb4b47329e1d23a05ccfc72855002052fffe518fe3b"
+  - archive: https://daml-binaries.da-ext.net/da-ghc-lib/ghc-lib-42e30fba558f2b7b02d3517092fe5da5.tar.gz
+    sha256: "a82e889711df26c9fa0d2d4e379dbb9af9974271ebf239b940885c783f68cf5f"
+  - archive: https://daml-binaries.da-ext.net/da-ghc-lib/ghc-lib-parser-42e30fba558f2b7b02d3517092fe5da5.tar.gz
+    sha256: "84979b89ff7dd83dd531edb9b65f16ba5e9fdc71ce90a3d8d276d589546749cb"
   - github: digital-asset/hlint
     commit: "c8246c1feb932858ff2b5d7e9e900068a974bf57"
     sha256: "3da24baf789c5f00211a92e24153e6b88102befaa946ada1f707935554500fe2"