aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-03-09 08:12:55 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2019-03-09 08:13:27 +0100
commit6b2ee268be459fbc104c054204e2992d4e241915 (patch)
tree9fb3f6cca01f8654394251edcd11b3c372071e81
parentff38148808619038e298f15aaead563efe93a995 (diff)
parent5bd078876adb4f3f5c2106b163cf0601c3e12b97 (diff)
downloadbitcoin-6b2ee268be459fbc104c054204e2992d4e241915.tar.xz
Merge #15562: doc: remove duplicate clone step in build-windows.md
5bd078876adb4f3f5c2106b163cf0601c3e12b97 doc: correct path in build-windows.md (Ferdinando M. Ametrano) Pull request description: Replaces #15550, remove duplicate clone and `cd` into `bitcoin/`. Tree-SHA512: d1f59906910b07c57f6aec75c89687a8cc2f0e677f9dac02b8fea5a4afd3f7903fabbf243403c239028e9bbf99aabfd36c8ebe8857956afeb06157ac546517e7
-rw-r--r--doc/build-windows.md17
1 files changed, 7 insertions, 10 deletions
diff --git a/doc/build-windows.md b/doc/build-windows.md
index 9641e0d3fd..036c585b44 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -71,6 +71,11 @@ If you want to build the windows installer with `make deploy` you need [NSIS](ht
sudo apt install nsis
+Acquire the source in the usual way:
+
+ git clone https://github.com/bitcoin/bitcoin.git
+ cd bitcoin
+
## Building for 64-bit Windows
The first step is to install the mingw-w64 cross-compilation tool chain:
@@ -87,11 +92,7 @@ Note that for WSL the Bitcoin Core source path MUST be somewhere in the default
example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
This means you cannot use a directory that is located directly on the host Windows file system to perform the build.
-Acquire the source in the usual way:
-
- git clone https://github.com/bitcoin/bitcoin.git
-
-Once the source code is ready the build steps are below:
+Build using:
PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var
cd depends
@@ -115,11 +116,7 @@ Note that for WSL the Bitcoin Core source path MUST be somewhere in the default
example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
This means you cannot use a directory that located directly on the host Windows file system to perform the build.
-Acquire the source in the usual way:
-
- git clone https://github.com/bitcoin/bitcoin.git
-
-Then build using:
+Build using:
PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var
cd depends