fixup

hebasto · Aug 20, 2024 · ffe0e69 · ffe0e69
1 parent b28d4ef
commit ffe0e69
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/configure.ac b/configure.ac
@@ -848,7 +848,7 @@ if test "$use_hardening" != "no"; then
   AX_CHECK_COMPILE_FLAG([-Wstack-protector], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
   AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
 
-  AX_CHECK_COMPILE_FLAG([-fcf-protection=none -fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=none -fcf-protection=full"])
+  AX_CHECK_COMPILE_FLAG([-fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"])
   HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,cet-report=error"
 
   case $host in

diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk
@@ -15,8 +15,8 @@ $(package)_cppflags_netbsd=-D_XOPEN_SOURCE=600
 $(package)_cppflags_mingw32=-DUNICODE -D_UNICODE
 
 ifeq ($(NO_HARDEN),)
-$(package)_cflags += -fcf-protection=none -fcf-protection=full
-$(package)_cxxflags += -fcf-protection=none -fcf-protection=full
+$(package)_cflags += -fcf-protection=full
+$(package)_cxxflags += -fcf-protection=full
 endif
 endef
 

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
@@ -18,7 +18,7 @@ define $(package)_set_vars
 
   ifeq ($(NO_HARDEN),)
   $(package)_cppflags+=-D_FORTIFY_SOURCE=3
-  $(package)_cflags += -fcf-protection=none -fcf-protection=full
+  $(package)_cflags += -fcf-protection=full
   endif
 endef
 

diff --git a/depends/packages/libnatpmp.mk b/depends/packages/libnatpmp.mk
@@ -7,7 +7,7 @@ $(package)_build_subdir=build
 
 define $(package)_set_vars
 ifeq ($(NO_HARDEN),)
-$(package)_cflags += -fcf-protection=none -fcf-protection=full
+$(package)_cflags += -fcf-protection=full
 endif
 endef
 

diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk
@@ -12,7 +12,7 @@ $(package)_config_opts += -DUPNPC_BUILD_STATIC=ON -DUPNPC_BUILD_TESTS=OFF
 $(package)_config_opts_mingw32 += -DMINIUPNPC_TARGET_WINDOWS_VERSION=0x0601
 
 ifeq ($(NO_HARDEN),)
-$(package)_cflags += -fcf-protection=none -fcf-protection=full
+$(package)_cflags += -fcf-protection=full
 endif
 endef
 

diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk
@@ -12,7 +12,7 @@ $(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_ICONV=TRUE
 $(package)_cflags += -Wno-int-conversion -Wno-implicit-function-declaration
 
 ifeq ($(NO_HARDEN),)
-$(package)_cflags += -fcf-protection=none -fcf-protection=full
+$(package)_cflags += -fcf-protection=full
 endif
 endef
 

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
@@ -189,8 +189,8 @@ $(package)_config_opts_mingw32 += -ltcg
 endif
 
 ifeq ($(NO_HARDEN),)
-$(package)_cflags += -fcf-protection=none -fcf-protection=full
-$(package)_cxxflags += -fcf-protection=none -fcf-protection=full
+$(package)_cflags += -fcf-protection=full
+$(package)_cxxflags += -fcf-protection=full
 endif
 endef
 

diff --git a/depends/packages/sqlite.mk b/depends/packages/sqlite.mk
@@ -14,7 +14,7 @@ $(package)_cppflags+=-DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_JSON -DSQLITE_LIKE
 $(package)_cppflags+=-DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_AUTOINIT
 
 ifeq ($(NO_HARDEN),)
-$(package)_cflags += -fcf-protection=none -fcf-protection=full
+$(package)_cflags += -fcf-protection=full
 endif
 endef
 

diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
@@ -22,7 +22,7 @@ define $(package)_set_vars
   $(package)_config_opts_mingw32 += -DZMQ_WIN32_WINNT=0x0601 -DZMQ_HAVE_IPC=OFF
 
   ifeq ($(NO_HARDEN),)
-  $(package)_cxxflags += -fcf-protection=none -fcf-protection=full
+  $(package)_cxxflags += -fcf-protection=full
   endif
 endef