From cb4af027c082d755aaa48b50a67952c0f0882758 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 4 Jul 2014 10:43:37 -0400
Subject: [PATCH] Bug 1034094 - Remove support for the gcc-style clang driver
 on Windows; r=glandium

This basically reverts the now unneeded parts of bug 752034.
clang-cl driver should be used on Windows instead.
---
 configure.in        | 11 ++++-------
 js/src/configure.in | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/configure.in b/configure.in
index d37a0e4c42d..9c15cf7916b 100644
--- a/configure.in
+++ b/configure.in
@@ -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)
diff --git a/js/src/configure.in b/js/src/configure.in
index 5302ac2bfc0..c1bb0231c28 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -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)