Use auto for default in flags-cflags.m4

Author: TheShermanTanker

make/autoconf/flags-cflags.m4

@@ -70,19 +70,16 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   DEBUG_PREFIX_CFLAGS=
 
   UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: literal,
-    DEFAULT: 2, VALID_VALUES: [1 2 3],
+    DEFAULT: [auto], VALID_VALUES: [auto 1 2 3],
     CHECK_AVAILABLE: [
       if test x$TOOLCHAIN_TYPE = xmicrosoft; then
         AVAILABLE=false
       fi
     ],
     DESC: [set the native debug symbol level (GCC and Clang only)],
     DEFAULT_DESC: [toolchain default],
-    IF_GIVEN: [
-      NATIVE_DEBUG_SYMBOLS_LEVEL="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
-    ],
-    IF_NOT_GIVEN: [
-      NATIVE_DEBUG_SYMBOLS_LEVEL=""
+    IF_AUTO: [
+      RESULT=""
     ])
 
   # Debug symbols
@@ -110,8 +107,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     fi
 
     # Debug info level should follow the debug format to be effective.
-    CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 ${NATIVE_DEBUG_SYMBOLS_LEVEL}"
-    ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
+    CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
       # Check if compiler supports -fdebug-prefix-map. If so, use that to make
@@ -131,8 +128,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
         IF_FALSE: [GDWARF_FLAGS=""])
 
     # Debug info level should follow the debug format to be effective.
-    CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} ${NATIVE_DEBUG_SYMBOLS_LEVEL}"
-    ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
+    CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi