wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1034094 - Remove support for the gcc-style clang driver on Windows; r=glandium

Browse Source 
This basically reverts the now unneeded parts of bug 752034.
clang-cl driver should be used on Windows instead.
This commit is contained in:
Ehsan Akhgari 2014-07-04 10:43:37 -04:00
parent 45e4426dac
commit cb4af027c0
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -440,7 +440,7 @@ esac
case "$target" in
*-mingw*)
if test "$GCC" != "yes" -a -z "$CLANG_CC"; then
if test "$GCC" != "yes"; then
# Check to see if we are really running in a msvc environemnt
_WIN32_MSVC=1
AC_CHECK_PROGS(MIDL, midl)
@ -620,7 +620,9 @@ case "$target" in
fi
CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
elif test -z "$CLANG_CC"; then
MOZ_FIND_WINSDK_VERSION
else
# Check w32api version
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
_W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
@ -675,11 +677,6 @@ case "$target" in
MOZ_WINSDK_MAXVER=0x06020000
fi # !GNU_CC
# If MSVC or clang
if test "$GCC" != "yes" -o -n "$CLANG_CC" ; then
MOZ_FIND_WINSDK_VERSION
fi
AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
# Require OS features provided by IE 6.0 SP2 (XP SP2)

11
js/src/configure.in
View File

@ -389,7 +389,7 @@ esac
case "$target" in
*-mingw*)
if test "$GCC" != "yes" -a -z "$CLANG_CC"; then
if test "$GCC" != "yes"; then
# Check to see if we are really running in a msvc environemnt
_WIN32_MSVC=1
@ -476,7 +476,9 @@ case "$target" in
CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
elif test -z "$CLANG_CC"; then
MOZ_FIND_WINSDK_VERSION
else
# Check w32api version
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
_W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
@ -515,11 +517,6 @@ case "$target" in
MOZ_WINSDK_MAXVER=0x06010000
fi # !GNU_CC
# If MSVC or clang
if test "$GCC" != "yes" -o -n "$CLANG_CC" ; then
MOZ_FIND_WINSDK_VERSION
fi
AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
# Require OS features provided by IE 6.0 SP2 (XP SP2)