[commit: ghc] wip/merge-queue: Clarify when to follow the instructions in doc/windows.md. (0b57486)

[git at git.haskell.org]

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

On branch  : wip/merge-queue
Link       : http://ghc.haskell.org/trac/ghc/changeset/0b57486fb002ff2a42b1478d4e48d961a381912e/ghc

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

commit 0b57486fb002ff2a42b1478d4e48d961a381912e
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jan 10 23:18:47 2019 +0000

    Clarify when to follow the instructions in doc/windows.md.
    
    See https://gitlab.haskell.org/ghc/ghc/merge_requests/100#note_2349.


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

0b57486fb002ff2a42b1478d4e48d961a381912e
 hadrian/README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/hadrian/README.md b/hadrian/README.md
index 9909f10..2400699 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.