aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-01-01 12:58:41 +0100
committerMarcoFalke <falke.marco@gmail.com>2017-01-01 12:59:00 +0100
commitcaa2f106d704ec3ade63498031dd58d34510bc76 (patch)
tree0debe94340902247ed11b9cac0e500e0d2c36382
parentbebe3697fdad4b1649162a69fd344d3510e18af8 (diff)
parentb705a04b917e4199cfa01b0b17d0df7591713d5b (diff)
Merge #9433: Update the Windows build notes
b705a04 Update the Windows build notes (Douglas Roark)
-rw-r--r--doc/build-windows.md17
1 files changed, 10 insertions, 7 deletions
diff --git a/doc/build-windows.md b/doc/build-windows.md
index b6a047b9c3..9549a4b9da 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -16,11 +16,13 @@ Compiling with Windows Subsystem For Linux
With Windows 10, Microsoft has released a new feature named the [Windows
Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about). This
-feature allows you to run a bash shell directly on Windows in an Ubuntu based
+feature allows you to run a bash shell directly on Windows in an Ubuntu-based
environment. Within this environment you can cross compile for Windows without
-the need for a separate Linux VM or Server.
+the need for a separate Linux VM or server.
-This feature is not supported in versions of Windows prior to Windows 10 or on Windows Server SKUs.
+This feature is not supported in versions of Windows prior to Windows 10 or on
+Windows Server SKUs. In addition, it is available [only for 64-bit versions of
+Windows](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide).
To get the bash shell, you must first activate the feature in Windows.
@@ -38,7 +40,9 @@ To get the bash shell, you must first activate the feature in Windows.
* Accept the license
* Create a new UNIX user account (this is a separate account from your Windows account)
-After the bash shell is active, you can follow the instructions below for Windows 64-bit Cross-compilation.
+After the bash shell is active, you can follow the instructions below, starting
+with the "Cross-compilation" section. Compiling the 64-bit version is
+recommended but it is possible to compile the 32-bit version.
Cross-compilation
-------------------
@@ -64,7 +68,7 @@ To build executables for Windows 64-bit, install the following dependencies:
Then build using:
cd depends
- make HOST=x86_64-w64-mingw32 -j4
+ make HOST=x86_64-w64-mingw32
cd ..
./autogen.sh # not required when building from tarball
CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/
@@ -79,7 +83,7 @@ To build executables for Windows 32-bit, install the following dependencies:
Then build using:
cd depends
- make HOST=i686-w64-mingw32 -j4
+ make HOST=i686-w64-mingw32
cd ..
./autogen.sh # not required when building from tarball
CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/
@@ -98,4 +102,3 @@ as they appear in the release `.zip` archive. This can be done in the following
way. This will install to `c:\workspace\bitcoin`, for example:
make install DESTDIR=/mnt/c/workspace/bitcoin
-