From b49015444308b159917a2a9a842d44ad801281cc Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Sun, 4 Aug 2024 22:51:51 -0700 Subject: [PATCH] test6 --- .github/workflows/build-and-test.yml | 5 +++-- configure.ac | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7f774e7719af5b..1d799b2de5b3b3 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -236,8 +236,8 @@ jobs: unit_tests: true functional_tests: true goal: deploy - cc: clang - cxx: clang++ + cc: $(brew --prefix llvm@15)/bin/clang + cxx: $(brew --prefix llvm@15)/bin/clang++ BITCOIN_CONFIG: "--enable-zmq --enable-gui --enable-reduce-exports --enable-werror --enable-debug --with-boost=/opt/homebrew/opt/boost@1.76" steps: @@ -289,6 +289,7 @@ jobs: if [ "${{ matrix.config.os }}" = "macos-14" ]; then export CPPFLAGS="-I/opt/homebrew/opt/boost@1.76/include -I/opt/homebrew/opt/berkeley-db@4/include" export LDFLAGS="-L/opt/homebrew/opt/boost@1.76/lib -L/opt/homebrew/opt/berkeley-db@4/lib" + export BOOSTROOT="/opt/homebrew/opt/boost@1.76" fi if [[ ${{ matrix.config.os }} = ubuntu* ]]; then diff --git a/configure.ac b/configure.ac index 278db48b65140d..6ccff6f5b97d3e 100644 --- a/configure.ac +++ b/configure.ac @@ -373,6 +373,7 @@ if test "x$CXXFLAGS_overridden" = "xno"; then AX_CHECK_COMPILE_FLAG([-Wdeprecated-register], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-deprecated-register"], [], [$CXXFLAG_WERROR]) AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-implicit-fallthrough"], [], [$CXXFLAG_WERROR]) AX_CHECK_COMPILE_FLAG([-Wenum-constexpr-conversion], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-enum-constexpr-conversion"], [], [$CXXFLAG_WERROR]) + AX_CHECK_COMPILE_FLAG([-Wdeprecated-builtins], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-deprecated-builtins"], [], [$CXXFLAG_WERROR]) fi enable_sse42=no