From 4b7e79f974448c1775a530e1301f9c2e0819daae Mon Sep 17 00:00:00 2001
From: Martijn van Beurden <mvanb1@gmail.com>
Date: Fri, 1 Apr 2022 00:42:45 -0400
Subject: [PATCH] Fix stack protector detection for C++

---
 m4/stack_protect.m4 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/m4/stack_protect.m4 b/m4/stack_protect.m4
index 38181a18..c59a4a97 100644
--- a/m4/stack_protect.m4
+++ b/m4/stack_protect.m4
@@ -54,14 +54,14 @@ AC_DEFUN([XIPH_GCC_STACK_PROTECTOR],
 AC_DEFUN([XIPH_GXX_STACK_PROTECTOR],
 [AC_LANG_PUSH([C++])
 	AC_MSG_CHECKING([if $CXX supports stack smash protection])
-	xiph_stack_check_old_cflags="$CFLAGS"
+	xiph_stack_check_old_cxxflags="$CXXFLAGS"
 	SSP_FLAGS="-fstack-protector-strong"
-	CFLAGS=$SSP_FLAGS
+	CXXFLAGS=$SSP_FLAGS
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 			#include <cstdio>
 			]], [[puts("Hello, World!"); return 0;]])],[AC_MSG_RESULT(yes)
-			CFLAGS="$xiph_stack_check_old_cflags $SSP_FLAGS"],[AC_MSG_RESULT(no)
-			CFLAGS="$xiph_stack_check_old_cflags"
+			CXXFLAGS="$xiph_stack_check_old_cxxflags $SSP_FLAGS"],[AC_MSG_RESULT(no)
+			CXXFLAGS="$xiph_stack_check_old_cxxflags"
 		])
 	AC_LANG_POP([C++])
 ])# XIPH_GXX_STACK_PROTECTOR