Bug 1472402 - -MG for clang-cl breaks missing-include error reporting. - r=froydnj
authorjgilbert@mozilla.com <jdashg@gmail.com>
Fri, 29 Jun 2018 20:18:08 -0700
changeset 424529 9935b243c9a3d98064f59f58847291f599fde152
parent 424528 96208f9a164e001dc3042ca96617718c3c601c17
child 424530 78472262694af726f25c367662bc3d508c98ae8d
push id34213
push userbtara@mozilla.com
push dateSat, 30 Jun 2018 21:49:26 +0000
treeherdermozilla-central@69c641de1fa6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1472402
milestone63.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 1472402 - -MG for clang-cl breaks missing-include error reporting. - r=froydnj MozReview-Commit-ID: EhtNTZcXBrt
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1584,17 +1584,17 @@ MOZ_ARG_HEADER(Build dependencies)
 if test "$GNU_CC" -a "$GNU_CXX"; then
   _DEPEND_CFLAGS='-MD -MP -MF $(MDDEPDIR)/$(@F).pp'
 else
   # clang-cl doesn't accept the normal -MD -MP -MF options that clang does, but
   # the underlying cc1 binary understands how to generate dependency files.
   # These options are based on analyzing what the normal clang driver sends to
   # cc1 when given the "correct" dependency options.
   if test -n "$CLANG_CL"; then
-   _DEPEND_CFLAGS='-Xclang -MP -Xclang -MG -Xclang -dependency-file -Xclang $(MDDEPDIR)/$(@F).pp -Xclang -MT -Xclang $@'
+   _DEPEND_CFLAGS='-Xclang -MP -Xclang -dependency-file -Xclang $(MDDEPDIR)/$(@F).pp -Xclang -MT -Xclang $@'
   fi
   dnl Don't override this for MSVC
   if test -z "$_WIN32_MSVC"; then
     _USE_CPP_INCLUDE_FLAG=
     _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
     _DEFINES_CXXFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
   else
     echo '#include <stdio.h>' > dummy-hello.c
--- a/old-configure.in
+++ b/old-configure.in
@@ -3726,17 +3726,17 @@ if test "$COMPILE_ENVIRONMENT"; then
 if test "$GNU_CC" -a "$GNU_CXX"; then
   _DEPEND_CFLAGS='-MD -MP -MF $(MDDEPDIR)/$(@F).pp'
 else
   # clang-cl doesn't accept the normal -MD -MP -MF options that clang does, but
   # the underlying cc1 binary understands how to generate dependency files.
   # These options are based on analyzing what the normal clang driver sends to
   # cc1 when given the "correct" dependency options.
   if test -n "$CLANG_CL"; then
-   _DEPEND_CFLAGS='-Xclang -MP -Xclang -MG -Xclang -dependency-file -Xclang $(MDDEPDIR)/$(@F).pp -Xclang -MT -Xclang $@'
+   _DEPEND_CFLAGS='-Xclang -MP -Xclang -dependency-file -Xclang $(MDDEPDIR)/$(@F).pp -Xclang -MT -Xclang $@'
   fi
   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'
   else
     echo '#include <stdio.h>' > dummy-hello.c