mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-23 13:29:43 +02:00
Merge bitcoin/bitcoin#32551: cmake: Remove ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI} from bitcoin-build-config.h
800b7cc42ccmake: Add missed `SSE41_CXXFLAGS` (Hennadii Stepanov)028476e71fcmake: Remove `ENABLE_ARM_SHANI` from `bitcoin-build-config.h` (Hennadii Stepanov)1e900528d2cmake: Remove `ENABLE_X86_SHANI` from `bitcoin-build-config.h` (Hennadii Stepanov)8689628e2ecmake: Remove `ENABLE_AVX2` from `bitcoin-build-config.h` (Hennadii Stepanov)a8e2342dcacmake: Remove `ENABLE_SSE41` from `bitcoin-build-config.h` (Hennadii Stepanov) Pull request description: `ENABLE_{SSE41,AVX2,X86_SHANI,ARM_SHANI}` are already conditionally defined for the [`bitcoin_crypto`](https://github.com/bitcoin/bitcoin/blob/master/src/crypto/CMakeLists.txt) target, and they are not used by any other targets. Defining them globally in `bitcoin-build-config.h` is therefore redundant. Additionally, the previously missing `SSE41_CXXFLAGS` variable has been [added](https://github.com/bitcoin/bitcoin/pull/32550#issuecomment-2890918551). ACKs for top commit: fanquake: ACK800b7cc42cTree-SHA512: da792a0b780c67b432b09c9288ca98d62545315c721fed13510d1c11f8bb0cddd9a4ed7a009b4d052471dda19d0641bbc1eae4805fc306d23bf9b4ef510089c8
This commit is contained in:
@@ -614,15 +614,7 @@ fn lint_includes_build_config() -> LintResult {
|
||||
"*.cpp",
|
||||
"*.h",
|
||||
])
|
||||
.args(get_pathspecs_default_excludes())
|
||||
.args([
|
||||
// These are exceptions which don't use bitcoin-build-config.h, rather CMakeLists.txt adds
|
||||
// these cppflags manually.
|
||||
":(exclude)src/crypto/sha256_arm_shani.cpp",
|
||||
":(exclude)src/crypto/sha256_avx2.cpp",
|
||||
":(exclude)src/crypto/sha256_sse41.cpp",
|
||||
":(exclude)src/crypto/sha256_x86_shani.cpp",
|
||||
]),
|
||||
.args(get_pathspecs_default_excludes()),
|
||||
)
|
||||
.expect("grep failed");
|
||||
git()
|
||||
|
||||
Reference in New Issue
Block a user