Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1577521 - Update configure to report an error if you try to build with mingw-gcc r=nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D47857

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Ritter 2019-10-03 15:44:36 +00:00
parent 7e32f859a9
commit 2e50f42b7a
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/old-configure.in
View File

@ -527,6 +527,11 @@ 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"
@ -537,13 +542,8 @@ case "$target" in
LIBS="$LIBS -lusp10 -lgdi32 -lwinmm -lwsock32"
MOZ_FIX_LINK_PATHS=
if test -z "$CLANG_CC"; then
# Use static libgcc and libstdc++
LDFLAGS="$LDFLAGS -static"
else
# Silence problematic clang warnings
CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
fi
# Silence problematic clang warnings
CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
MOZ_OPTIMIZE_FLAGS="-O2"

20
old-configure.in
View File

@ -645,6 +645,11 @@ 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"
@ -660,19 +665,8 @@ case "$target" in
WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
WIN32_GUI_EXE_LDFLAGS=-mwindows
if test -z "$CLANG_CC"; then
# Use static libgcc and libstdc++
LDFLAGS="$LDFLAGS -static"
# GCC/binutils can't link to a function if we try to include dllexport function
# in the same library as dllimport caller. To work around it, we build NSPR
# and NSS with -mnop-fun-dllimport flag. The drawback of this solution is that
# function thunks need to be generated for cross-DLL calls.
MOZ_FOLD_LIBS_FLAGS="-mnop-fun-dllimport"
else
# Silence problematic clang warnings
CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
fi
# Silence problematic clang warnings
CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
else
TARGET_COMPILER_ABI=msvc
RANLIB='echo not_ranlib'