From d84afb615f98636c1429244e02555c80429b95df Mon Sep 17 00:00:00 2001
From: Shayne Fletcher <shayne.fletcher@digitalasset.com>
Date: Fri, 26 Jul 2019 12:54:45 -0400
Subject: [PATCH] Delete now redundant temporary 8.8.1 build notes (#2303)

* Delete now redundant temporary 8.8.1 build notes

* Add in a missing command
---
 ghc-lib/working-on-ghc-lib.md | 45 +++++------------------------------
 1 file changed, 6 insertions(+), 39 deletions(-)

diff --git a/ghc-lib/working-on-ghc-lib.md b/ghc-lib/working-on-ghc-lib.md
index 7017a48dfb..540a9789f2 100644
--- a/ghc-lib/working-on-ghc-lib.md
+++ b/ghc-lib/working-on-ghc-lib.md
@@ -57,7 +57,7 @@ The equivalent commands to build the `8.8.1` compatible branch are:
 git clone https://gitlab.haskell.org/ghc/ghc.git
 cd ghc
 git fetch --tags
-git checkout ghc-8.8.1-alpha1
+git checkout ghc-8.8.1-rc1
 git remote add upstream git@github.com:digital-asset/ghc.git
 git fetch upstream
 git merge --no-edit upstream/da-master-8.8.1
@@ -93,10 +93,12 @@ The equivalent 8.8.1 commands are:
 ```
 mkdir -p ~/tmp && cd ~/tmp
 git clone git@github.com:digital-asset/ghc-lib.git
-cd ghc-lib && git clone https://gitlab.haskell.org/ghc/ghc.git
+cd ghc-lib
+git checkout ghc-8.8.1-rc1
+git clone https://gitlab.haskell.org/ghc/ghc.git
 cd ghc
 git fetch --tags
-git checkout ghc-8.8.1-alpha1
+git checkout ghc-8.8.1-rc1
 git remote add upstream git@github.com:digital-asset/ghc.git
 git fetch upstream
 git merge --no-edit upstream/da-master-8.8.1 upstream/da-unit-ids-8.8.1
@@ -118,6 +120,7 @@ This creates `~tmp/ghc-lib/ghc-lib-parser-xxx.tar.gz` where `xxx` is the version
 
 3. Generate `ghc-lib.cabal` by running:
 ```bash
+git checkout stack.yaml
 (cd ghc && git clean -xf && git checkout .)
 stack exec -- ghc-lib-gen ghc --ghc-lib
 ```
@@ -270,39 +273,3 @@ hadrian/build.stack.sh --configure --flavour=quickest -j
 As usual, the compiler is built to `_build/stage1/bin/ghc`.
 
 When you are ready to publish your feature branch, push to `upstream` and raise your PR with base `da-master`.
-
-## Temporary build instructions
-
-At the current time, there are bugs with `stack`/`happy`/`cabal` and the `--configure` hadrian option. While these get worked out we are using the following procedure for building `ghc-lib` for DAML.
-```
-git clone git@github.com:digital-asset/ghc-lib.git ghc-lib.git
-cd ghc-lib.git
-git checkout ghc-8.8.1-alpha2
-git clone https://gitlab.haskell.org/ghc/ghc.git ghc
-cd ghc
-git checkout ghc-8.8.1-alpha2
-git submodule update --init --recursive
-git remote add upstream git@github.com:digital-asset/ghc.git
-git fetch upstream
-git merge --no-edit upstream/da-master-8.8.1 upstream/da-unit-ids-8.8.1
-cd .. # ghc-lib directory
-cabal build
-cabal run -- ghc --ghc-lib-parser
-cd ghc
-# *** Edit ghc/ghc-lib-parser.cabal. Change version number etc as
-#     per the documention. ***
-cabal sdist
-cp dist/ghc-lib-parser-8.8.0.20190620.tar.gz ..
-git clean -xf && git checkout . # Reset for next run
-cd ..
-cabal run -- ghc --ghc-lib
-cd ghc
-# *** Edit ghc/ghc-lib.cabal. Change version number etc as per
-#     the documention. ***
-cabal sdist
-cp dist/ghc-lib-8.8.0.20190620.tar.gz ..
-cd ..
-ls *.tar.gz
-# There are now ghc-lib-parser and ghc-lib sdists in your ghc-lib
-#  directory. Proceed to deployment.
-```