Bug 1585700 - Remove unconditional -mwindows from the mingw compilation r=nalexander
authorTom Ritter <tom@mozilla.com>
Thu, 03 Oct 2019 15:46:04 +0000
changeset 2367357 ecb0e3d35a47ef3e11938d256522e187aee57450
parent 2367356 0e871ed50b6c30999fba87362058c60112fc8195
child 2367358 c38b3c03d21feedfbce28e0ca1bff0269c35c5e6
push id431344
push usermasayuki@d-toybox.com
push dateFri, 04 Oct 2019 04:18:24 +0000
treeherdertry@f382a43f9af1 [default view] [failures only]
reviewersnalexander
bugs1585700
milestone71.0a1
Bug 1585700 - Remove unconditional -mwindows from the mingw compilation r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D47921
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -527,19 +527,16 @@ case "$target" in
     DSO_CFLAGS=
     DSO_PIC_CFLAGS=
     if test -n "$GNU_CC" -o -n "$CLANG_CC"; then
         # $GNU_CC will match gcc and clang; while $CLANG_CC will match only clang
         if test -z "$CLANG_CC"; then
             AC_MSG_ERROR(Firefox cannot be built with mingw-gcc and requires a mingw-clang toolchain to work)
         fi
 
-        CC="$CC -mwindows"
-        CXX="$CXX -mwindows"
-        CPP="$CPP -mwindows"
         DSO_LDOPTS='-shared'
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
         # mingw doesn't require kernel32, user32, and advapi32 explicitly
         LIBS="$LIBS -lusp10 -lgdi32 -lwinmm -lwsock32"
         MOZ_FIX_LINK_PATHS=
 
         # Silence problematic clang warnings
--- a/old-configure.in
+++ b/old-configure.in
@@ -645,19 +645,16 @@ case "$target" in
     # certain versions of cygwin's makedepend barf on the
     # #include <string> vs -I./dist/include/string issue so don't use it
     if test -n "$GNU_CC" -o -n "$CLANG_CC"; then
         # $GNU_CC will match gcc and clang; while $CLANG_CC will match only clang
         if test -z "$CLANG_CC"; then
             AC_MSG_ERROR(Firefox cannot be built with mingw-gcc and requires a mingw-clang toolchain to work)
         fi
 
-        CC="$CC -mwindows"
-        CXX="$CXX -mwindows"
-        CPP="$CPP -mwindows"
         DSO_LDOPTS='-shared'
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
         # mingw doesn't require kernel32, user32, and advapi32 explicitly
         LIBS="$LIBS -luuid -lusp10 -lgdi32 -lwinmm -lwsock32 -luserenv -lsecur32"
         MOZ_FIX_LINK_PATHS=
 
         MOZ_OPTIMIZE_FLAGS="-O2"