--- configure.orig	2015-08-16 07:23:14.000000000 -0700
+++ configure	2018-06-18 05:04:22.000000000 -0700
@@ -2093,7 +2093,7 @@
   program_prefix=${target_alias}-
 
 
-# We want to inhibit AC_PROG_C* macros adding the default "-g -O2" flags.
+# We want to inhibit AC_PROG_C* macros adding the default "-g" flags.
 # To do so, make sure that the variables are not unset - it is ok if they are
 # empty. However, their value MUST be retained, since one may have
 # called ./configure CFLAGS=-foobar.
@@ -3021,13 +3021,13 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+    CFLAGS=""
   else
     CFLAGS=
   fi
@@ -3368,13 +3368,13 @@
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
+    CXXFLAGS="-g"
   else
     CXXFLAGS="-g"
   fi
 else
   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
+    CXXFLAGS=""
   else
     CXXFLAGS=
   fi
@@ -3553,8 +3553,8 @@
                                                 my_CXXFLAGS="$my_CXXFLAGS -g -O0 -Wall -Wundef -Wno-ctor-dtor-privacy"
         my_CFLAGS="$my_CFLAGS -g -O0 -Wall -Wundef"
     else
-        my_CXXFLAGS="$my_CXXFLAGS -O2"
-        my_CFLAGS="$my_CFLAGS -O2"
+        my_CXXFLAGS="$my_CXXFLAGS"
+        my_CFLAGS="$my_CFLAGS"
     fi
     # User-supplied CXXFLAGS must always take precedence.
     # This still sucks because using `make CFLAGS=-foobar` kills
@@ -3908,13 +3908,13 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+    CFLAGS=""
   else
     CFLAGS=
   fi
@@ -4668,13 +4668,13 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+    CFLAGS=""
   else
     CFLAGS=
   fi