Skip to content

Commit f96ae94

Browse files
committed
Merge bitcoin/bitcoin#32525: build: Revert "Temporarily disable compiling fuzz/utxo_snapshot.cpp with MSVC
fa2c662 build: Revert "Temporarily disable compiling `fuzz/utxo_snapshot.cpp` with MSVC" (MarcoFalke) Pull request description: Now that GitHub Actions has a fixed version and the Windows developers have updated their compiler, the workaround is no longer needed. ACKs for top commit: davidgumberg: reACK bitcoin/bitcoin@fa2c662 hodlinator: ACK fa2c662 Tree-SHA512: 952b36c917c91d78d82b5013e1df338b23f860fad7be43327150581f403050e61f748fc75557ec96fb2b115a2cc0246a506bc2ddc25e05f5a41339bd466c4b1a
2 parents 725c9f7 + fa2c662 commit f96ae94

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

doc/build-windows-msvc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ For cross-compiling options, please see [`build-windows.md`](./build-windows.md)
1010

1111
This guide relies on using CMake and vcpkg package manager provided with the Visual Studio installation.
1212
Here are requirements for the Visual Studio installation:
13-
1. Minimum required version: Visual Studio 2022 version 17.6.
13+
1. Minimum required version: Visual Studio 2022 version 17.13.
1414
2. Installed components:
1515
- The "Desktop development with C++" workload.
1616

src/test/fuzz/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ add_executable(fuzz
127127
txgraph.cpp
128128
txorphan.cpp
129129
txrequest.cpp
130-
# Visual Studio 2022 version 17.12 introduced a bug
131-
# that causes an internal compiler error.
132-
# See: https://github.com/bitcoin/bitcoin/issues/31303
133-
$<$<VERSION_LESS:${MSVC_VERSION},1942>:utxo_snapshot.cpp>
130+
utxo_snapshot.cpp
134131
utxo_total_supply.cpp
135132
validation_load_mempool.cpp
136133
vecdeque.cpp

0 commit comments

Comments
 (0)