Skip to content

Commit d2136d3

Browse files
committed
Merge bitcoin/bitcoin#31502: depends: Fix CXXFLAGS on NetBSD
a10bb40 depends: Fix CXXFLAGS on NetBSD (Hennadii Stepanov) Pull request description: This PR corrects an issue where `CXXFLAGS` were mistakenly overridden by `CFLAGS`. This behaviour was introduced in 7e7b3e4 (from bitcoin/bitcoin#22380). On the master branch: ``` $ gmake --no-print-directory -C depends print-x86_64_netbsd_CXXFLAGS x86_64_netbsd_CXXFLAGS=-pipe -std=c11 ``` With this PR: ``` $ gmake --no-print-directory -C depends print-x86_64_netbsd_CXXFLAGS x86_64_netbsd_CXXFLAGS=-pipe -std=c++20 ``` ACKs for top commit: theuni: utACK a10bb40 Tree-SHA512: 0c842db2965ebb0a58693394715922810235d9e5f2a7416fe258eb252dbd68ec04f90a0f7948abe938caf94a9194cca7deb53a08335c4404cce3a40c5cb44944
2 parents 58436d4 + a10bb40 commit d2136d3

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

depends/hosts/netbsd.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ netbsd_NM = $(host_toolchain)gcc-nm
77
netbsd_RANLIB = $(host_toolchain)gcc-ranlib
88
endif
99

10-
netbsd_CXXFLAGS=$(netbsd_CFLAGS)
11-
1210
netbsd_release_CFLAGS=-O2
1311
netbsd_release_CXXFLAGS=$(netbsd_release_CFLAGS)
1412

0 commit comments

Comments
 (0)