Skip to content

Commit a386034

Browse files
committed
Merge bitcoin/bitcoin#31100: doc: remove dependency install instructions from win docs
184f12c doc: remove dependency install instructions from win docs (fanquake) Pull request description: This duplicates what is in depends, and is outdated. Closes #31090. ACKs for top commit: maflcko: lgtm ACK 184f12c jarolrod: ACK 184f12c BrandonOdiwuor: ACK 184f12c Tree-SHA512: 089c9ff91c501c22ec1b9d5925a2b8c6cd1ea9ac2b75dd6a8c5fe75cf2f0090d808842cb321017894d2da70a30a87dbc1c4c481771d3c4aba13ce44244fcf392
2 parents 479715e + 184f12c commit a386034

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

depends/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ For more information, see [SDK Extraction](../contrib/macdeploy/README.md#sdk-ex
5454

5555
#### For Win64 cross compilation
5656

57-
- see [build-windows.md](../doc/build-windows.md#cross-compilation-for-ubuntu-and-windows-subsystem-for-linux)
57+
apt install g++-mingw-w64-x86-64-posix
5858

5959
#### For linux (including i386, ARM) cross compilation
6060

doc/build-windows.md

+3-21
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,18 @@ The steps below can be performed on Ubuntu or WSL. The depends system
2828
will also work on other Linux distributions, however the commands for
2929
installing the toolchain will be different.
3030

31-
First, install the general dependencies:
32-
33-
sudo apt update
34-
sudo apt upgrade
35-
sudo apt install cmake curl g++ git make pkg-config
36-
37-
A host toolchain (`g++`) is necessary because some dependency
38-
packages need to build host utilities that are used in the build process.
39-
40-
See [dependencies.md](dependencies.md) for a complete overview.
31+
See [README.md](../depends/README.md) in the depends directory for which
32+
dependencies to install and [dependencies.md](dependencies.md) for a complete overview.
4133

4234
If you want to build the Windows installer using the `deploy` build target, you will need [NSIS](https://nsis.sourceforge.io/Main_Page):
4335

44-
sudo apt install nsis
36+
apt install nsis
4537

4638
Acquire the source in the usual way:
4739

4840
git clone https://github.com/bitcoin/bitcoin.git
4941
cd bitcoin
5042

51-
## Building for 64-bit Windows
52-
53-
The first step is to install the mingw-w64 cross-compilation toolchain:
54-
55-
```sh
56-
sudo apt install g++-mingw-w64-x86-64-posix
57-
```
58-
59-
Once the toolchain is installed the build steps are common:
60-
6143
Note that for WSL the Bitcoin Core source path MUST be somewhere in the default mount file system, for
6244
example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
6345
This means you cannot use a directory that is located directly on the host Windows file system to perform the build.

0 commit comments

Comments
 (0)