From 7b14d1a00b4c3639382bf8d3ad6d8a511843005e Mon Sep 17 00:00:00 2001
From: Duke <duke@hush.is>
Date: Mon, 29 Dec 2025 23:28:30 -0500
Subject: [PATCH] Set CCFLAGS not CPPFLAGS

---
 depends/packages/libsodium.mk | 3 +--
 util/build.sh                 | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk
index baf8dad6a..ec3d74d15 100644
--- a/depends/packages/libsodium.mk
+++ b/depends/packages/libsodium.mk
@@ -6,7 +6,6 @@ $(package)_download_file=0d9f589e-a9f9-4ddb-acaa-0f1b423b32eb
 $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
 $(package)_dependencies=
 $(package)_config_opts=
-$(package)_cppflags+=-std=gnu17
 ifeq ($(build_os),darwin)
 define $(package)_set_vars
   $(package)_build_env=MACOSX_DEPLOYMENT_TARGET="10.11"
@@ -24,7 +23,7 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  $(MAKE)
+  CCFLAGS='-std=gnu17' $(MAKE)
 endef
 
 define $(package)_stage_cmds
diff --git a/util/build.sh b/util/build.sh
index 2cf7934b0..22bfd2f73 100755
--- a/util/build.sh
+++ b/util/build.sh
@@ -127,11 +127,11 @@ as --version | tail -n1
 ld -v
 autoconf --version
 
-HOST="$HOST" BUILD="$BUILD" "$MAKE" CPPFLAGS='-std=gnu17' "$@" -C ./depends/ V=1
+HOST="$HOST" BUILD="$BUILD" "$MAKE" CCFLAGS='-std=gnu17' "$@" -C ./depends/ V=1
 
 time ./autogen.sh
 
-CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" $CONFIGURE_FLAGS CXXFLAGS='-g' CPPFLAGS='-std=gnu17'
+CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" $CONFIGURE_FLAGS CXXFLAGS='-g' CCFLAGS='-std=gnu17'
 
 # Build CryptoConditions stuff
 WD=$PWD