[commit: ghc] wip/nfs-locking: Minor revision (c6efd3f)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:28:43 UTC 2017


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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/c6efd3f68521f20632a0a173e1568aa772c0ea48/ghc

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

commit c6efd3f68521f20632a0a173e1568aa772c0ea48
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Oct 5 17:58:20 2017 +0100

    Minor revision


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

c6efd3f68521f20632a0a173e1568aa772c0ea48
 doc/windows.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/windows.md b/doc/windows.md
index f644f03..b374074 100644
--- a/doc/windows.md
+++ b/doc/windows.md
@@ -2,19 +2,11 @@
 
 [![Windows status](https://img.shields.io/appveyor/ci/snowleopard/hadrian/master.svg?label=Windows)](https://ci.appveyor.com/project/snowleopard/hadrian)
 
-Here is how you can build GHC, from source, on Windows. We assume that `git` and `stack` are
-installed (see [prerequisites](https://github.com/snowleopard/hadrian/blob/master/doc/windows.md#prerequisites)).
-
-Note that `git` should be configured to check out Unix-style line endings. The default behaviour of `git` on Windows is to check out Windows-style line endings which can cause issues during the build. This can be changed using the following command:
-
-    git config --global core.autocrlf false
-
-If you would like to restore the default behaviour later run:
-
-    git config --global core.autocrlf true
+Here is how you can build GHC, from source, on Windows. We assume that `git` and `stack` are installed
+(see [prerequisites](https://github.com/snowleopard/hadrian/blob/master/doc/windows.md#prerequisites)).
 
 ```sh
-# Get GHC and Hadrian sources
+# Get GHC and Hadrian sources; git core.autocrlf should be set to false (see Prerequisites section)
 git clone --recursive git://git.haskell.org/ghc.git
 cd ghc
 git clone git://github.com/snowleopard/hadrian
@@ -55,6 +47,16 @@ The above works on a clean machine with `git` and `stack` installed (tested with
 installation settings), which you can get from https://git-scm.com/download/win and
 https://www.stackage.org/stack/windows-x86_64-installer.
 
+Note that `git` should be configured to check out Unix-style line endings. The default behaviour
+of `git` on Windows is to check out Windows-style line endings which can cause issues during the
+build. This can be changed using the following command:
+
+    git config --global core.autocrlf false
+
+If you would like to restore the default behaviour later run:
+
+    git config --global core.autocrlf true
+
 ## Testing
 
 These instructions have been tested on a clean Windows 10 machine using the
@@ -65,4 +67,3 @@ and are also routinely tested on
 ## Notes
 
 Beware of the [current limitations of Hadrian](https://github.com/snowleopard/hadrian#current-limitations).
-



More information about the ghc-commits mailing list