Bug 1119225 - Emulate Visual C++ 2013 Update 3 when using clang-cl; r=ted
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 08 Jan 2015 08:42:42 -0500
changeset 248611 48f8a884901ba9753d3bddab08f25c60e1915601
parent 248610 ef7d3c85457105f24ad482f18fe016c263b2db78
child 248612 bcacb5692ad902fc0ec6ebea2ad382a8a3fd5183
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1119225
milestone37.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 1119225 - Emulate Visual C++ 2013 Update 3 when using clang-cl; r=ted
build/autoconf/toolchain.m4
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -81,19 +81,19 @@ fi
 if test "$compiler" = "clang-cl"; then
     CLANG_CL=1
     # We force clang-cl to emulate Visual C++ 2013 in configure.in, but that
     # is based on the CLANG_CL variable defined here, so make sure that we're
     # getting the right version here manually.
     CC_VERSION=1800
     CXX_VERSION=1800
     MSVC_VERSION_FULL=180030723
-    # Build on clang-cl with MSVC 2013 with fallback emulation.
-    CFLAGS="$CFLAGS -fmsc-version=1800 -fallback"
-    CXXFLAGS="$CXXFLAGS -fmsc-version=1800 -fallback"
+    # Build on clang-cl with MSVC 2013 Update 3 with fallback emulation.
+    CFLAGS="$CFLAGS -fms-compatibility-version=18.00.30723 -fallback"
+    CXXFLAGS="$CXXFLAGS -fms-compatibility-version=18.00.30723 -fallback"
 fi
 
 if test "$GNU_CC"; then
     if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
         GCC_USE_GNU_LD=1
     fi
 fi