bitcoin-core: fix 32-bit workaround for LTO

google · Jul 14, 2023 · c6d9ab5 · c6d9ab5
1 parent 0843f8d
commit c6d9ab5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/projects/bitcoin-core/build.sh b/projects/bitcoin-core/build.sh
@@ -34,13 +34,13 @@ sed -i 's/flto/flto=thin/g' ./configure.ac
 
 if [ "$ARCHITECTURE" = "i386" ]; then
 # Temporary workaround for building sqlite for 32-bit. Due to https://github.com/google/oss-fuzz/pull/10466#issuecomment-1576658462
-sed -i 's/-D_LIBCPP_ENABLE_ASSERTIONS=1/-D_LIBCPP_ENABLE_ASSERTIONS=1 -m32/g' ./depends/hosts/linux.mk
+export FIX_32BIT=" -m32"
 fi
 
 (
   cd depends
   sed -i --regexp-extended '/.*rm -rf .*extract_dir.*/d' ./funcs.mk  # Keep extracted source
-  make HOST=$BUILD_TRIPLET DEBUG=1 LTO=1 NO_QT=1 NO_BDB=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1 NO_USDT=1 AR=llvm-ar RANLIB=llvm-ranlib CPPFLAGS="-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE" -j$(nproc)
+  make HOST=$BUILD_TRIPLET DEBUG=1 LTO=1 NO_QT=1 NO_BDB=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1 NO_USDT=1 AR=llvm-ar RANLIB=llvm-ranlib CPPFLAGS="-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE ${FIX_32BIT:-}" -j$(nproc)
 )
 
 # Build the fuzz targets