Fix GHC build errors on macOS (#11560)

changelog_begin changelog_end
digital-asset · Nov 9, 2021 · cfd521f · cfd521f
1 parent a7559d0
commit cfd521f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git 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: 'a4a78867205bc453416f58f1d6dce470a0e39d61 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
@@ -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
@@ -3,10 +3,10 @@
 
 resolver: lts-18.0
 packages:
-  - archive: https://daml-binaries.da-ext.net/da-ghc-lib/ghc-lib-f1468b856c4a52a7826bfc0c29dee4f4.tar.gz
-    sha256: "f939726fdc6dbe67db4aeac86b3f6bcd88997dcb5648dc0d7e7f221760074165"
-  - archive: https://daml-binaries.da-ext.net/da-ghc-lib/ghc-lib-parser-f1468b856c4a52a7826bfc0c29dee4f4.tar.gz
-    sha256: "fbbca516fc2f8fab9d3095cde1edb98d3f05af9ea2dfb927275ed745b394685c"
+  - 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"