diff --git a/flint.spec b/flint.spec
index 1e6255e..3c3a03e 100644
--- a/flint.spec
+++ b/flint.spec
@@ -135,6 +135,17 @@ done
 # We set HAVE_FAST_COMPILER to 0 on i686, ARM, s390, and 32-bit MIPS because
 # otherwise the tests exhaust virtual memory.  If other architectures run out
 #of virtual memory while building flintxx/test/t-fmpzxx.cpp, then do likewise.
+%ifarch %{arm}
+# Work around bz 1555151
+export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0 -fno-tree-tail-merge"
+%else
+%ifarch %{ix86} s390 %{mips32}
+export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0"
+%else
+export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
+%endif
+%endif
+export CXXFLAGS="$CFLAGS"
 
 # Build the non-gc version
 pushd %{name}-%{version}
@@ -148,19 +159,9 @@ sh -x ./configure \
     --with-ntl=%{_prefix} \
     --enable-cxx \
     --extensions=$PWD/hmod_mat \
-%ifarch %{arm}
-    # Work around bz 1555151
-    CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0 -fno-tree-tail-merge" \
-    CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0 -fno-tree-tail-merge"
-%else
-%ifarch %{ix86} s390 %{mips32}
-    CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0" \
-    CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0"
-%else
-    CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \
-    CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
-%endif
-%endif
+    CFLAGS="$CFLAGS" \
+    CXXFLAGS="$CXXFLAGS"
+
 # FIXME: %%{?_smp_mflags} sometimes fails
 make verbose LDFLAGS="-Wl,--as-needed $RPM_LD_FLAGS -L%{_libdir}/atlas" \
   LIBDIR=%{_lib}
@@ -182,13 +183,9 @@ sh -x ./configure \
     --with-ntl=%{_prefix} \
     --with-gc=%{_prefix} \
     --enable-cxx \
-%ifarch %{ix86} %{arm} s390 %{mips32}
-    CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0" \
-    CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -DHAVE_FAST_COMPILER=0"
-%else
-    CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \
-    CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
-%endif
+    CFLAGS="$CFLAGS" \
+    CXXFLAGS="$CXXFLAGS"
+
 # FIXME: %%{?_smp_mflags} sometimes fails
 make verbose LDFLAGS="-Wl,--as-needed $RPM_LD_FLAGS -L%{_libdir}/atlas" \
   LIBDIR=%{_lib}