From 521693378b86aaae5af1646c3a18a902cc835c69 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 1 Mar 2024 11:52:00 -0500 Subject: build: move sha256_sse4 into libbitcoin_crypto_base Followup to discussion in #29407. Drops LIBBITCOIN_CRYPTO_SSE4. --- src/Makefile.am | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3e24ea5a7e..b5d5c4652a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,8 +50,6 @@ LIBBITCOIN_WALLET_TOOL=libbitcoin_wallet_tool.a endif LIBBITCOIN_CRYPTO = $(LIBBITCOIN_CRYPTO_BASE) -LIBBITCOIN_CRYPTO_SSE4 = crypto/libbitcoin_crypto_sse4.la -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE4) if ENABLE_SSE41 LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.la LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41) @@ -582,6 +580,7 @@ crypto_libbitcoin_crypto_base_la_SOURCES = \ crypto/sha1.h \ crypto/sha256.cpp \ crypto/sha256.h \ + crypto/sha256_sse4.cpp \ crypto/sha3.cpp \ crypto/sha3.h \ crypto/sha512.cpp \ @@ -589,13 +588,6 @@ crypto_libbitcoin_crypto_base_la_SOURCES = \ crypto/siphash.cpp \ crypto/siphash.h -# See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and -# CXXFLAGS above -crypto_libbitcoin_crypto_sse4_la_LDFLAGS = $(AM_LDFLAGS) -static -crypto_libbitcoin_crypto_sse4_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -static -crypto_libbitcoin_crypto_sse4_la_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_sse4_la_SOURCES = crypto/sha256_sse4.cpp - # See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and # CXXFLAGS above crypto_libbitcoin_crypto_sse41_la_LDFLAGS = $(AM_LDFLAGS) -static -- cgit v1.2.3