From 198f155cf4bfb65644037a6982b2c378a2e77ade Mon Sep 17 00:00:00 2001 From: nathanielcwm <22572406+nathanielcwm@users.noreply.github.com> Date: Sun, 31 Oct 2021 11:05:00 +0800 Subject: [PATCH] port newer commits --- doc/build-openbsd.md | 2 +- doc/build-windows.md | 21 ++++----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md index 315c95a751..bcf7375454 100644 --- a/doc/build-openbsd.md +++ b/doc/build-openbsd.md @@ -1,6 +1,6 @@ OpenBSD build guide ====================== -(updated for OpenBSD 6.7) +(updated for OpenBSD 6.9) This guide describes how to build gridcoinresearchd, command-line utilities, and GUI on OpenBSD. diff --git a/doc/build-windows.md b/doc/build-windows.md index ceb4f39dfa..041b387df8 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -7,8 +7,8 @@ The options known to work for building Gridcoin on Windows are: * On Linux, using the [Mingw-w64](https://mingw-w64.org/doku.php) cross compiler tool chain. and is the platform used to build the Gridcoin Windows release binaries. -* On Windows, using [Windows -Subsystem for Linux (WSL)](https://docs.microsoft.com/windows/wsl/about) and the Mingw-w64 cross compiler tool chain. + +* On Windows, using [Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/windows/wsl/about) and Mingw-w64. * On Windows, using a native compiler tool chain such as [Visual Studio](https://www.visualstudio.com). Other options which may work, but which have not been extensively tested are (please contribute instructions): @@ -18,28 +18,15 @@ Other options which may work, but which have not been extensively tested are (pl Installing Windows Subsystem for Linux --------------------------------------- -With Windows 10, Microsoft has released a new feature named the [Windows -Subsystem for Linux (WSL)](https://docs.microsoft.com/windows/wsl/about). This -feature allows you to run a bash shell directly on Windows. Within this environment you can cross compile for Windows without -the need for a separate Linux VM or server. - Note that while WSL can be installed with other Linux variants, such as OpenSUSE, the following instructions have only been tested with Ubuntu. -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. - -[Full instructions to install WSL are available here.](https://docs.microsoft.com/windows/wsl/install-win10#manual-installation-steps) - -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. +[Follow the upstream installation instructions, available here](https://docs.microsoft.com/windows/wsl/install-win10). Cross-compilation for Ubuntu and Windows Subsystem for Linux ------------------------------------------------------------ -The steps below can be performed on Ubuntu (including in a VM) or WSL. The depends system +The steps below can be performed on Ubuntu or WSL. The depends system will also work on other Linux distributions, however the commands for installing the toolchain will be different.