From 01043c63555fac28d2bf23a071b7b60c8f9ebc83 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Sat, 5 Oct 2019 11:39:30 -0400
Subject: [PATCH] ...

---
 configure             | 6 ++----
 configure.ac          | 4 +---
 m4/ax_gcc_archflag.m4 | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 183330809..37397218b 100755
--- a/configure
+++ b/configure
@@ -4581,7 +4581,7 @@ MAGICK_PATCHLEVEL_VERSION=68
 
 MAGICK_VERSION=7.0.8-68
 
-MAGICK_GIT_REVISION=16175:d44f8a355:20191005
+MAGICK_GIT_REVISION=16176:b316fbb74:20191005
 
 
 # Substitute library versioning
@@ -9296,9 +9296,7 @@ $as_echo "$ax_cv_gcc_archflag" >&6; }
 if test "x$ax_cv_gcc_archflag" = xunknown; then
   :
 else
-
-  CFLAGS="$CFLAGS $ax_cv_gcc_archflag"
-  CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"
+  CFLAGS="$CFLAGS $ax_cv_gcc_archflag" CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 54d5ca100..49cb89351 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,9 +298,7 @@ AC_PROG_AWK
 AC_PROG_MKDIR_P
 AM_WITH_DMALLOC
 AX_C___ATTRIBUTE__
-AX_GCC_ARCHFLAG([yes], [
-  CFLAGS="$CFLAGS $ax_cv_gcc_archflag"
-  CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"])
+AX_GCC_ARCHFLAG([yes])
 PKG_PROG_PKG_CONFIG([0.20])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
diff --git a/m4/ax_gcc_archflag.m4 b/m4/ax_gcc_archflag.m4
index c52b9b296..8d78a2d13 100644
--- a/m4/ax_gcc_archflag.m4
+++ b/m4/ax_gcc_archflag.m4
@@ -262,6 +262,6 @@ AC_MSG_RESULT($ax_cv_gcc_archflag)
 if test "x$ax_cv_gcc_archflag" = xunknown; then
   m4_default([$3],:)
 else
-  m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag"])
+  m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag" CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"])
 fi
 ])
-- 
2.40.0