Skip to content

Commit 2560b68

Browse files
committed
Merge bitcoin/bitcoin#23007: doc: remove WSL install instructions and point to upstream
f58f697 doc: remove WSL install instructions and point to upstream (fanquake) Pull request description: There's not really any need for us to have to replicate (ever-changing) instructions for installing an operating system in our build documentation. ACKs for top commit: laanwj: ACK f58f697 hebasto: ACK f58f697 Tree-SHA512: 3ca90cf7696909503ca500756c718f019c410b1e24c139e7e9fdc8726d1c37a7b6c869fdac1cb7ab8c8065bc49c808778ca5985f54d4a698c162866d00397d48
2 parents de2af19 + f58f697 commit 2560b68

File tree

1 file changed

+5
-35
lines changed

1 file changed

+5
-35
lines changed

doc/build-windows.md

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ Below are some notes on how to build Bitcoin Core for Windows.
55

66
The options known to work for building Bitcoin Core on Windows are:
77

8-
* On Linux, using the [Mingw-w64](https://mingw-w64.org/doku.php) cross compiler tool chain. Ubuntu Bionic 18.04 is required
9-
and is the platform used to build the Bitcoin Core Windows release binaries.
10-
* On Windows, using [Windows
11-
Subsystem for Linux (WSL)](https://docs.microsoft.com/windows/wsl/about) and the Mingw-w64 cross compiler tool chain.
12-
* On Windows, using a native compiler tool chain such as [Visual Studio](https://www.visualstudio.com). See [README.md](/build_msvc/README.md).
8+
* On Linux, using the [Mingw-w64](https://www.mingw-w64.org/) cross compiler tool chain.
9+
* On Windows, using [Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/windows/wsl/about) and Mingw-w64.
10+
* On Windows, using [Microsoft Visual Studio](https://www.visualstudio.com). See [README.md](/build_msvc/README.md).
1311

1412
Other options which may work, but which have not been extensively tested are (please contribute instructions):
1513

@@ -18,40 +16,12 @@ Other options which may work, but which have not been extensively tested are (pl
1816
Installing Windows Subsystem for Linux
1917
---------------------------------------
2018

21-
With Windows 10, Microsoft has released a new feature named the [Windows
22-
Subsystem for Linux (WSL)](https://docs.microsoft.com/windows/wsl/about). This
23-
feature allows you to run a bash shell directly on Windows in an Ubuntu-based
24-
environment. Within this environment you can cross compile for Windows without
25-
the need for a separate Linux VM or server. Note that while WSL can be installed with
26-
other Linux variants, such as OpenSUSE, the following instructions have only been
27-
tested with Ubuntu.
28-
29-
This feature is not supported in versions of Windows prior to Windows 10 or on
30-
Windows Server SKUs. In addition, it is available [only for 64-bit versions of
31-
Windows](https://docs.microsoft.com/windows/wsl/install-win10).
32-
33-
Full instructions to install WSL are available on the above link.
34-
To install WSL on Windows 10 with Fall Creators Update installed (version >= 16215.0) do the following:
35-
36-
1. Enable the Windows Subsystem for Linux feature
37-
* Open the Windows Features dialog (`OptionalFeatures.exe`)
38-
* Enable 'Windows Subsystem for Linux'
39-
* Click 'OK' and restart if necessary
40-
2. Install Ubuntu
41-
* Open Microsoft Store and search for "Ubuntu 18.04" or use [this link](https://www.microsoft.com/store/productId/9N9TNGVNDL3Q)
42-
* Click Install
43-
3. Complete Installation
44-
* Open a cmd prompt and type "Ubuntu1804"
45-
* Create a new UNIX user account (this is a separate account from your Windows account)
46-
47-
After the bash shell is active, you can follow the instructions below, starting
48-
with the "Cross-compilation" section. Compiling the 64-bit version is
49-
recommended, but it is possible to compile the 32-bit version.
19+
Follow the upstream installation instructions, available [here](https://docs.microsoft.com/windows/wsl/install-win10).
5020

5121
Cross-compilation for Ubuntu and Windows Subsystem for Linux
5222
------------------------------------------------------------
5323

54-
The steps below can be performed on Ubuntu (including in a VM) or WSL. The depends system
24+
The steps below can be performed on Ubuntu or WSL. The depends system
5525
will also work on other Linux distributions, however the commands for
5626
installing the toolchain will be different.
5727

0 commit comments

Comments
 (0)