From 1bd090e7fb727fdd4af0570cf6c05a7d2218b0eb Mon Sep 17 00:00:00 2001 From: merge-script Date: Mon, 12 Aug 2024 11:24:59 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#30597: doc: Drop no longer needed workaround for WSL 16d82611812de4e91e7950fe6d31484cc7a9c937 doc: Drop no longer needed workaround for WSL (Hennadii Stepanov) Pull request description: This PR effectively reverts commit 4f890ba6bc8caba5394c7a5388d7f07959ced78b from https://github.com/bitcoin/bitcoin/pull/11437, which fixed some build issues on WSL seven years ago. Testing the current master branch @ 31a3ff55154bf15fb35b157c3f67ec05408ecdf9 on Windows 11 + WSL using Ubuntu 24.04 or Debian images, I noticed that the workaround is no longer required. Moreover, it doesn't affect the build process at all, which means the hashes of the built packages in depends remain the same and the `configure` log in the main build system remains the same as well. ACKs for top commit: sipsorcery: utACK 16d82611812de4e91e7950fe6d31484cc7a9c937. Tree-SHA512: 703a2ac4647125c91aad47131e2723fd05af30b0cfae5677a26d3e89a77c2779e0197584208f3b378ed64dd7305512d9064fd073ec06517f86e9905af4ec8838 --- doc/build-windows.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/build-windows.md b/doc/build-windows.md index 02fa001ed3..841164eeb3 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -52,7 +52,6 @@ is to temporarily disable WSL support for Win32 applications. Build using: - PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var sudo bash -c "echo 0 > /proc/sys/fs/binfmt_misc/status" # Disable WSL support for Win32 applications. cd depends make HOST=x86_64-w64-mingw32