From 8dd16415f2cc580e947da07eaeba172902e8a741 Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Tue, 18 Jun 2024 18:52:43 -0700 Subject: [PATCH] ga: explicitly export bdb flags for macos-12 runners --- .github/workflows/build-and-test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 88575adc80b2e..05d4844749a0c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -151,8 +151,8 @@ jobs: export LDFLAGS="-L/opt/homebrew/opt/boost@1.76/lib" export CPPFLAGS="-I/opt/homebrew/opt/boost@1.76/include" else - export CPPFLAGS="-I/usr/local/opt/boost@1.76/include" - export LDFLAGS="-L/usr/local/opt/boost@1.76/lib" + export CPPFLAGS="-I/usr/local/opt/boost@1.76/include -I/usr/local/opt/berkeley-db@4/include" + export LDFLAGS="-L/usr/local/opt/boost@1.76/lib -L/usr/local/opt/berkeley-db@4/lib" fi fi fi @@ -260,6 +260,11 @@ jobs: export CXX fi + if [ "${{ matrix.config.os }}" = "macos-12" ]; then + export CPPFLAGS="-I/usr/local/opt/boost@1.76/include -I/usr/local/opt/berkeley-db@4/include" + export LDFLAGS="-L/usr/local/opt/boost@1.76/lib -L/usr/local/opt/berkeley-db@4/lib" + fi + if [[ ${{ matrix.config.os }} = ubuntu* ]]; then OUTDIR_PATH="$GITHUB_WORKSPACE/$GITHUB_RUN_NUMBER" BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$GITHUB_WORKSPACE --bindir=$OUTDIR_PATH/bin --libdir=$OUTDIR_PATH/lib"