Merge pull request #9886 from awlauria/02_v5.0.x

v5.0.x: Remove -O2 from --enable-debug builds.

Author: gpaulsen

config/ompi_setup_fc.m4

@@ -72,12 +72,6 @@ AC_DEFUN([OMPI_SETUP_FC],[
            ompi_fc_happy=0],
           [ompi_fc_happy=1])
 
-    AS_IF([test $ompi_fc_happy -eq 1 && test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no"],
-          [FCFLAGS="$FCFLAGS -g"
-           OPAL_FLAGS_UNIQ(FCFLAGS)
-           AC_MSG_WARN([-g has been added to FCFLAGS (--enable-debug)])
-          ])
-
     # Make sure the compiler actually works, if not cross-compiling.
     # Don't just use the AC macro so that we can have a pretty
     # message.

config/opal_configure_options.m4

@@ -187,10 +187,47 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_TIMING, $WANT_TIMING,
 AM_CONDITIONAL([OPAL_COMPILE_TIMING], [test "$WANT_TIMING" = "1"])
 AM_CONDITIONAL([OPAL_INSTALL_TIMING_BINARIES], [test "$WANT_TIMING" = "1" && test "$enable_binaries" != "no"])
 
+# Later calls to AC_PROG_CC/CXX/FC can
+# inject things like -O2 into compile flags if they are
+# not defined, which we don't want. Make sure these flags
+# are at least set to an empty string now.
+#
+# Complicating matters is that autogen can re-order
+# these calls toward the top of configure. This block should
+# be at/near the top, so do it now.
+#
 if test "$WANT_DEBUG" = "0"; then
     CFLAGS="-DNDEBUG $CFLAGS"
     CXXFLAGS="-DNDEBUG $CXXFLAGS"
+
+    # NDEBUG doesn't exist in fortran, so just make sure it's defined.
+    if [ test -z "$FCFLAGS" ]; then
+      FCFLAGS=""
+    fi
+else
+    # Do we want debugging symbols?
+    if test "$enable_debug_symbols" != "no" ; then
+        CFLAGS="$CFLAGS -g"
+        CXXFLAGS="$CXXFLAGS -g"
+        FCFLAGS="$FCFLAGS -g"
+        AC_MSG_WARN([-g has been added to compiler (--enable-debug)])
+    else
+        # If not set, define compile flags to an empty string
+        # to prevent AC_PROG_CC/FC/CXX from modifying compiler flags.
+        # See: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/C-Compiler.html
+        # for more info.
+        if [ test -z "$CFLAGS" ]; then
+            CFLAGS=""
+        fi
+        if [ test -z "$CXXFLAGS" ]; then
+            CXXFLAGS=""
+        fi
+        if [ test -z "$FCFLAGS" ]; then
+            FCFLAGS=""
+        fi
+    fi
 fi
+
 AC_DEFINE_UNQUOTED(OPAL_ENABLE_DEBUG, $WANT_DEBUG,
     [Whether we want developer-level debugging code or not])
 

config/opal_setup_cc.m4

@@ -276,15 +276,6 @@ AC_DEFUN([OPAL_SETUP_CC],[
         OPAL_FLAGS_UNIQ(LDFLAGS)
         WANT_DEBUG=1
    fi
-    
-
-    # Do we want debugging?
-    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
-        CFLAGS="$CFLAGS -g"
-
-        OPAL_FLAGS_UNIQ(CFLAGS)
-        AC_MSG_WARN([-g has been added to CFLAGS (--enable-debug)])
-    fi
 
     # These flags are generally gcc-specific; even the
     # gcc-impersonating compilers won't accept them.
@@ -428,20 +419,12 @@ AC_DEFUN([_OPAL_PROG_CC],[
     #
     # Check for the compiler
     #
-    OPAL_VAR_SCOPE_PUSH([opal_cflags_save dummy opal_cc_arvgv0])
+    OPAL_VAR_SCOPE_PUSH([dummy opal_cc_arvgv0])
 
-    # AC_USE_SYSTEM_EXTENSIONS alters CFLAGS (e.g., adds -g -O2)
-    opal_cflags_save="$CFLAGS"
     AC_USE_SYSTEM_EXTENSIONS
-    # AC_USE_SYSTEM_EXTENSIONS will modify CFLAGS if nothing was in there
-    # beforehand.  We don't want that.  So if there was nothing in
-    # CFLAGS, put nothing back in there.
-    AS_IF([test -z "$opal_cflags_save"], [CFLAGS=])
 
-    opal_cflags_save="$CFLAGS"
     AC_PROG_CC
     BASECC="`basename $CC`"
-    CFLAGS="$opal_cflags_save"
     OPAL_CC="$CC"
     AC_DEFINE_UNQUOTED(OPAL_CC, "$OPAL_CC", [OMPI underlying C compiler])
     set dummy $CC