summaryrefslogtreecommitdiff
path: root/hadrian
diff options
context:
space:
mode:
authorAndrey Mokhov <andrey.mokhov@gmail.com>2019-01-10 23:18:47 +0000
committerBen Gamari <ben@well-typed.com>2019-01-14 09:30:40 -0500
commitef8fedc17355b9f9b5dd08521248462be25c324c (patch)
tree253893553c865522982f23312f34f2c037fbfadb /hadrian
parentec752c4c88ef09f84492f42f7677e90953c6bed7 (diff)
downloadhaskell-ef8fedc17355b9f9b5dd08521248462be25c324c.tar.gz
Clarify when to follow the instructions in doc/windows.md.
See https://gitlab.haskell.org/ghc/ghc/merge_requests/100#note_2349.
Diffstat (limited to 'hadrian')
-rw-r--r--hadrian/README.md12
1 files changed, 8 insertions, 4 deletions
diff --git a/hadrian/README.md b/hadrian/README.md
index 9909f10d9a..2400699c73 100644
--- a/hadrian/README.md
+++ b/hadrian/README.md
@@ -40,10 +40,14 @@ or simply `-c`. See the overview of command line flags below.
Notes:
-* If the default build script doesn't work, you might want to give a try to
-another one, e.g. based on Cabal sandboxes (`build.cabal.*`) or
-Stack (`build.stack.*`). Also see
-[instructions for building GHC on Windows using Stack][windows-build].
+* If the default build script doesn't work, you might want to try another one,
+e.g. based on Cabal sandboxes (`build.cabal.*`), Stack (`build.stack.*`) or Nix
+(`build.stack.nix.*`).
+
+* On Windows, if you do not want to install MSYS, you can use the Stack-based
+build script (Stack provides a managed MSYS environment), as described in
+[these instructions][windows-build]. If you don't mind installing MSYS yourself
+or already have it, you can use the Cabal-based build script.
* Hadrian is written in Haskell and depends on `shake` (plus a few packages that
`shake` depends on), `mtl`, `quickcheck`, and GHC core libraries.