diff --git a/packages/macos/openocd/build-openocd.sh b/packages/macos/openocd/build-openocd.sh
index 9635b70..68fbffc 100755
--- a/packages/macos/openocd/build-openocd.sh
+++ b/packages/macos/openocd/build-openocd.sh
@@ -7,7 +7,7 @@ sed -i -e 's/uint /unsigned int /g' ./src/flash/nor/rp2040.c
 ./bootstrap
 # See https://github.com/raspberrypi/openocd/issues/30
 # ./configure --disable-werror CAPSTONE_CFLAGS="$(pkg-config capstone --cflags | sed s/.capstone\$//)"
-./configure LDFLAGS=-static --disable-werror
+./configure CFLAGS=-static LDFLAGS=-static --disable-werror
 make clean
 make -j$(nproc)
 INSTALLDIR="$PWD/../openocd-install/usr/local/bin"
diff --git a/packages/macos/riscv/build-riscv-gcc.sh b/packages/macos/riscv/build-riscv-gcc.sh
index 9d7cb36..2a7470e 100755
--- a/packages/macos/riscv/build-riscv-gcc.sh
+++ b/packages/macos/riscv/build-riscv-gcc.sh
@@ -13,7 +13,7 @@ GDB_TARGET_FLAGS_EXTRA="--with-gmp=/opt/homebrew --with-mpfr=/opt/homebrew"
 export GDB_TARGET_FLAGS_EXTRA
 
 cd riscv-gnu-toolchain
-./configure LDFLAGS=-static --prefix=$BUILDDIR/$INSTALLDIR --with-arch=rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb --with-abi=ilp32 --with-multilib-generator="rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb-ilp32--;rv32imac_zicsr_zifencei_zba_zbb_zbs_zbkb-ilp32--" --with-gcc-src=$BUILDDIR/gcc
+./configure CFLAGS=-static LDFLAGS=-static --prefix=$BUILDDIR/$INSTALLDIR --with-arch=rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb --with-abi=ilp32 --with-multilib-generator="rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb-ilp32--;rv32imac_zicsr_zifencei_zba_zbb_zbs_zbkb-ilp32--" --with-gcc-src=$BUILDDIR/gcc
 # 4 threads, as 8 threads runs out of memory
 make -j4