Bug 1403346 - Do not set unneeded CFLAGS variables during artifact builds. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Wed, 25 Oct 2017 15:10:04 -0700
changeset 388381 f675216f052e809d2700cce69a8808da990a8517
parent 388380 80674bf1fef5c0a7d672d54ea27eb24ec3548753
child 388382 e20f0eb3eda3290913043cfce03f6778b8255cbb
push id96616
push useracraciun@mozilla.com
push dateThu, 26 Oct 2017 09:35:17 +0000
treeherdermozilla-inbound@92767404525a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1403346
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1403346 - Do not set unneeded CFLAGS variables during artifact builds. r=glandium When we move to a shell aware split for AC_SUBST_LIST it will become an error to emit an unquoted make variable reference. Currently this happens to only occur during artifact builds when setting cflags related variables that aren't needed there anyway, so here we skip settting those variables when a compile environment isn't present. MozReview-Commit-ID: EnHu48yyZ1C
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -4130,16 +4130,17 @@ fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl =
 dnl = Build depencency options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Build dependencies)
 
+if test "$COMPILE_ENVIRONMENT"; then
 if test "$GNU_CC" -a "$GNU_CXX"; then
   _DEPEND_CFLAGS='-MD -MP -MF $(MDDEPDIR)/$(@F).pp'
 else
   dnl Don't override this for MSVC
   if test -z "$_WIN32_MSVC"; then
     _USE_CPP_INCLUDE_FLAG=
     _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
     _DEFINES_CXXFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
@@ -4162,16 +4163,17 @@ else
 
     dnl Make sure that the build system can handle non-ASCII characters
     dnl in environment variables to prevent it from breaking silently on
     dnl non-English systems.
     NONASCII=$'\241\241'
     AC_SUBST(NONASCII)
   fi
 fi
+fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl =
 dnl = Static Build Options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Static build options)