Bug 1307626: Correctly define DEBUG substitution in debug artifact builds. r=glandium

MozReview-Commit-ID: Io2eq64Bx7L

--HG--
extra : rebase_source : 42324ea9ef9b775a6399b3f43df5dee349780f13

build/autoconf/compiler-opts.m4

@@ -92,6 +92,7 @@ MOZ_ARG_WITH_STRING(debug-label,
 done])
 
 if test -n "$MOZ_DEBUG"; then
+    if test -n "$COMPILE_ENVIRONMENT"; then
         AC_MSG_CHECKING([for valid debug flags])
         _SAVE_CFLAGS=$CFLAGS
         CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
@@ -104,6 +105,7 @@ if test -n "$MOZ_DEBUG"; then
             AC_MSG_ERROR([These compiler flags are invalid: $MOZ_DEBUG_FLAGS])
         fi
         CFLAGS=$_SAVE_CFLAGS
+    fi
 
     MOZ_DEBUG_DEFINES="$MOZ_DEBUG_ENABLE_DEFS"
 else

old-configure.in

@@ -1339,6 +1339,7 @@ if test -z "$COMPILE_ENVIRONMENT"; then
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
     PKG_SKIP_STRIP=1
+    MOZ_DEBUGGING_OPTS
 else
     MOZ_COMPILER_OPTS
 fi # COMPILE_ENVIRONMENT