зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1186064 - Require Visual Studio 2015 Update 2; r=glandium
Per froydnj in bug 1186064 comment #23, "it makes sense to proceed with removing MSVC 2013 support." This commit does that. We also go a step further and require VS2015 Update 2 instead of just update 1. This temporarily brings us down to just 1 officially supported Visual Studio version. However, VS2015u3 was just released and is unofficially supported. Since MOZ_CRT is no longer set, references to it have been removed. MozReview-Commit-ID: 8MUR6qLzQA5 --HG-- extra : rebase_source : 8f5061080a3d56dd484f9be03649fb65f0145f67
This commit is contained in:
Gregory Szorc
Родитель
dd8fb0b2c3
Коммит
5030a743a1
|
|
@ -55,27 +55,19 @@ def GeckoBinary(linkage='dependent', msvcrt='dynamic', mozglue=None):
|
|||
error('`linkage` must be "dependent", "standalone" or None')
|
||||
|
||||
if mozglue:
|
||||
if CONFIG['MOZ_CRT']:
|
||||
if msvcrt == 'dynamic':
|
||||
USE_LIBS += ['mozcrt']
|
||||
elif msvcrt == 'static':
|
||||
LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS']
|
||||
if mozglue == 'program':
|
||||
USE_LIBS += ['mozglue']
|
||||
if CONFIG['MOZ_GLUE_IN_PROGRAM']:
|
||||
if CONFIG['GNU_CC']:
|
||||
LDFLAGS += ['-rdynamic']
|
||||
if CONFIG['MOZ_MEMORY']:
|
||||
USE_LIBS += ['memory']
|
||||
elif mozglue == 'library':
|
||||
if not CONFIG['MOZ_GLUE_IN_PROGRAM']:
|
||||
USE_LIBS += ['mozglue']
|
||||
else:
|
||||
error('`msvcrt` must be "dynamic" or "static"')
|
||||
else:
|
||||
LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS']
|
||||
if mozglue == 'program':
|
||||
USE_LIBS += ['mozglue']
|
||||
if CONFIG['MOZ_GLUE_IN_PROGRAM']:
|
||||
if CONFIG['GNU_CC']:
|
||||
LDFLAGS += ['-rdynamic']
|
||||
if CONFIG['MOZ_MEMORY']:
|
||||
USE_LIBS += ['memory']
|
||||
elif mozglue == 'library':
|
||||
if not CONFIG['MOZ_GLUE_IN_PROGRAM']:
|
||||
USE_LIBS += ['mozglue']
|
||||
else:
|
||||
error('`mozglue` must be "program" or "library"')
|
||||
error('`mozglue` must be "program" or "library"')
|
||||
|
||||
if not CONFIG['JS_STANDALONE']:
|
||||
USE_LIBS += [
|
||||
|
|
|
|||
|
|
@ -541,13 +541,12 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
|
|||
'Only clang/llvm 3.4 or newer is supported.')
|
||||
|
||||
if info.type == 'msvc':
|
||||
if info.version < '18.00.30723' or (
|
||||
'19' < info.version < '19.00.23506'):
|
||||
if info.version < '19.00.23918':
|
||||
raise FatalCheckError(
|
||||
'This version (%s) of the MSVC compiler is not '
|
||||
'supported.\n'
|
||||
'You must install Visual C++ 2013 Update 3, Visual '
|
||||
'C++ 2015 Update 1, or newer in order to build.\n'
|
||||
'You must install Visual C++ 2015 Update 2 or newer in '
|
||||
'order to build.\n'
|
||||
'See https://developer.mozilla.org/en/'
|
||||
'Windows_Build_Prerequisites' % info.version)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
_VSPATH="/c/tools/vs2013"
|
||||
export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT
|
||||
|
||||
## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ##
|
||||
export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
|
||||
|
||||
## libs: win8.1 sdk x86 (32-bit) libs, msvc (32-bit) std library, msvc atl libs, directx sdk (32-bit) for d3d9 ##
|
||||
export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib
|
||||
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib
|
||||
|
||||
## paths: win8.1 sdk x86 (32-bit) tools, msvc (64-bit compiling 32-bit) build toolchain, moz tools ##
|
||||
export PATH="/c/Program Files (x86)/Windows Kits/8.1/bin/x86:${_VSPATH}/Common7/IDE:${_VSPATH}/VC/BIN/amd64_x86:${_VSPATH}/VC/BIN/amd64:${_VSPATH}/Common7/Tools:${_VSPATH}/VC/VCPackages:/c/mozilla-build/moztools:${PATH}"
|
||||
|
||||
## WindowsSDKDir ##
|
||||
export WINDOWSSDKDIR="/c/Program Files (x86)/Windows Kits/8.1/"
|
||||
|
||||
. $topsrcdir/build/mozconfig.vs-common
|
||||
|
||||
mk_export_correct_style LIB
|
||||
mk_export_correct_style LIBPATH
|
||||
mk_export_correct_style PATH
|
||||
mk_export_correct_style INCLUDE
|
||||
mk_export_correct_style WIN32_REDIST_DIR
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
_VSPATH="/c/tools/vs2013"
|
||||
export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC120.CRT
|
||||
|
||||
## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ##
|
||||
export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
|
||||
|
||||
## libs: win8.1 sdk x64 (64-bit) libs, msvc (64-bit) std library, msvc atl libs, directx sdk (64-bit) for d3d9 ##
|
||||
export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64
|
||||
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64
|
||||
|
||||
## paths: win8.1 sdk x64 (64-bit) tools, msvc (64-bit) build toolchain, moz tools ##
|
||||
export PATH="/c/Program Files (x86)/Windows Kits/8.1/bin/x64:${_VSPATH}/Common7/IDE:${_VSPATH}/VC/BIN/amd64:${_VSPATH}/VC/BIN/x86_amd64:${_VSPATH}/VC/BIN:${_VSPATH}/Common7/Tools:${_VSPATH}/VC/VCPackages:${PATH}"
|
||||
|
||||
## WindowsSDKDir ##
|
||||
export WINDOWSSDKDIR="/c/Program Files (x86)/Windows Kits/8.1/"
|
||||
|
||||
. $topsrcdir/build/mozconfig.vs-common
|
||||
|
||||
mk_export_correct_style LIB
|
||||
mk_export_correct_style LIBPATH
|
||||
mk_export_correct_style PATH
|
||||
mk_export_correct_style INCLUDE
|
||||
mk_export_correct_style WIN32_REDIST_DIR
|
||||
|
|
@ -367,12 +367,7 @@ endif
|
|||
# Can't pass this in DEFAULT_GMAKE_FLAGS because that overrides
|
||||
# definitions in NSS, so just export it into the sub-make's environment.
|
||||
ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_MEMORY))
|
||||
ifdef MOZ_CRT
|
||||
# OS_LIBS comes from having mozcrt as a dependency in moz.build.
|
||||
DLLFLAGS := $(OS_LIBS)
|
||||
else
|
||||
DLLFLAGS := -LIBPATH:$(ABS_DIST)/../mozglue/build -DEFAULTLIB:mozglue
|
||||
endif
|
||||
export DLLFLAGS
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -168,9 +168,6 @@ endif
|
|||
ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)
|
||||
mozglue/build/target memory/replace/logalloc/replay/target: memory/replace/dummy/target
|
||||
endif
|
||||
ifdef MOZ_CRT
|
||||
mozglue/crt/target: mozglue/build/target
|
||||
endif
|
||||
# js/src/target can end up invoking js/src/host rules (through object files
|
||||
# depending on jsautokw.h, which depends on host_jskwgen, and that can't
|
||||
# happen at the same time (bug #1146738)
|
||||
|
|
|
|||
|
|
@ -134,7 +134,6 @@ case $cmd in
|
|||
${MKDIR} -p ${tgtpath}/mozglue
|
||||
cp -pPR \
|
||||
${TOPSRCDIR}/mozglue/build \
|
||||
${TOPSRCDIR}/mozglue/crt \
|
||||
${TOPSRCDIR}/mozglue/misc \
|
||||
${TOPSRCDIR}/mozglue/moz.build \
|
||||
${tgtpath}/mozglue
|
||||
|
|
|
|||
|
|
@ -215,12 +215,6 @@ case "$target" in
|
|||
AC_DEFINE(_USE_MATH_DEFINES) # Otherwise MSVC's math.h doesn't #define M_PI.
|
||||
|
||||
case "$CC_VERSION" in
|
||||
18*)
|
||||
_CC_SUITE=12
|
||||
MSVS_VERSION=2013
|
||||
MSVC_C_RUNTIME_DLL=msvcr120.dll
|
||||
MSVC_CXX_RUNTIME_DLL=msvcp120.dll
|
||||
;;
|
||||
19*)
|
||||
_CC_SUITE=14
|
||||
MSVS_VERSION=2015
|
||||
|
|
@ -1915,7 +1909,6 @@ if test "$MOZ_MEMORY"; then
|
|||
;;
|
||||
esac
|
||||
fi
|
||||
AC_SUBST(MOZ_CRT)
|
||||
AC_SUBST(MOZ_GLUE_IN_PROGRAM)
|
||||
AC_SUBST_LIST(MOZ_GLUE_WRAP_LDFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
|
|||
else:
|
||||
Library('mozglue')
|
||||
|
||||
if not CONFIG['MOZ_CRT']:
|
||||
SDK_LIBRARY = True
|
||||
SDK_LIBRARY = True
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
SOURCES += [
|
||||
|
|
|
|||
|
|
@ -1,89 +0,0 @@
|
|||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# Roll our own custom logic here for the import library
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
# Linking Mozilla itself to jemalloc is not particularly difficult. To do this
|
||||
# we avoid linking directly to the Microsoft-provided CRT import libraries.
|
||||
# Instead, we link to our own import library which we generate here. To
|
||||
# replace the CRT's malloc/free/other memory management symbols we export
|
||||
# our own versions out of jemalloc.dll. We then take the import library that
|
||||
# the compiler generates for jemalloc.dll and combine it with the MS CRT import
|
||||
# libraries. We put our library on the command line first, and the CRT symbols
|
||||
# are discarded in favor of our versions!
|
||||
#
|
||||
# Unfortunately that was too easy. The CRT import library is not a standard
|
||||
# import library that contains a list of symbols and whatnot. It also includes
|
||||
# object files that are linked into generated programs. One of these,
|
||||
# crtdll.obj is (as one might expect) linked into all DLLs that link against
|
||||
# the CRT. This file does things like run static C++ constructors when the
|
||||
# DLL is attached, call DllMain, etc.
|
||||
#
|
||||
# In the CRT source all malloc/free calls are made to malloc_crt and free_crt.
|
||||
# In debug builds these are both defined to malloc_dbg and free_dbg. In opt
|
||||
# builds malloc_crt is an actual function, implemented and exposed from the
|
||||
# CRT. free_crt is, however, defined to be just plain old free. This works
|
||||
# fine inside the CRT where malloc_crt and free operate on the same heap.
|
||||
# Outside the CRT malloc_crt is in the CRT's heap, but free is in jemalloc's
|
||||
# heap. This causes much pain at shutdown :-(
|
||||
#
|
||||
# The obvious solution here is to override malloc_crt too. Unfortunately,
|
||||
# that doesn't work because the CRT expects to be able to call msize on this
|
||||
# piece of memory deep inside the CRT, which will fail because it'll call the
|
||||
# CRT's msize on a pointer in jemalloc's heap.
|
||||
#
|
||||
# Our solution to this is quite devious. We take apart the CRT's import lib
|
||||
# and remove the problematic object file. We then poke at the object file's
|
||||
# symbol table and replace '__imp__free' (which means grab free from some
|
||||
# other DLL) with '__imp__frex'. Then we define our own dummy no-op function
|
||||
# in jemalloc.dll and export it as frex. Then we put the CRT import lib
|
||||
# back together with the patched crtdll.obj, glue it to the end of jemalloc's
|
||||
# import library and link the rest of Mozilla to that.
|
||||
#
|
||||
# The result? A binary that uses jemalloc, doesn't crash, and leaks a tiny
|
||||
# amount of memory (32 words per DLL in the 2010 CRT) at shutdown.
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
target:: mozcrt.lib
|
||||
$(INSTALL) $(IFLAGS2) mozcrt.lib $(DIST)/lib
|
||||
|
||||
# And finally combine that with the jemalloc import library to get an import
|
||||
# library that has our malloc/free/etc and the CRT's everything else
|
||||
mozcrt.lib: ../build/mozglue.lib msvc_modified.lib
|
||||
lib -OUT:$@ $^
|
||||
|
||||
# Put the fixed object file back in
|
||||
msvc_modified.lib: msvc_removed.lib crtdll_fixed.obj
|
||||
lib -OUT:$@ $^
|
||||
|
||||
# Fix the object file
|
||||
crtdll_fixed.obj: crtdll.obj
|
||||
$(PYTHON) $(srcdir)/fixcrt.py
|
||||
|
||||
# Find the path of crtdll.obj
|
||||
CRTDLL_FULLPATH=$(subst \,\\,$(shell lib -list msvc_combined.lib | grep crtdll\\.obj))
|
||||
|
||||
# Remove the broken object file, only after we have extracted it
|
||||
msvc_removed.lib: msvc_combined.lib crtdll.obj
|
||||
lib -OUT:$@ msvc_combined.lib -REMOVE:$(CRTDLL_FULLPATH)
|
||||
|
||||
# Extract the broken object file out of the combined library
|
||||
crtdll.obj: msvc_combined.lib
|
||||
lib -OUT:$@ $^ -EXTRACT:$(CRTDLL_FULLPATH)
|
||||
|
||||
# Grab both CRT libraries and combine them into one library to simplify things
|
||||
msvc_combined.lib:
|
||||
lib -OUT:$@ $(WIN32_CRT_LIBS)
|
||||
|
||||
# Normally, we'd use SDK_LIBRARY, but we can't because all the tricks above
|
||||
# involve *not* defining the library in moz.build, so SDK_LIBRARY = True would
|
||||
# not have the expected outcome.
|
||||
SDK_FILES = mozcrt.lib
|
||||
SDK_DEST = $(SDK_LIB_DIR)
|
||||
SDK_TARGET = target
|
||||
INSTALL_TARGETS += SDK
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
from __future__ import with_statement
|
||||
|
||||
with open('crtdll.obj', 'rb') as infile:
|
||||
data = infile.read()
|
||||
with open('crtdll_fixed.obj', 'wb') as outfile:
|
||||
# for Win32
|
||||
data = data.replace('__imp__free', '__imp__frex')
|
||||
# for Win64
|
||||
data = data.replace('__imp_free', '__imp_frex')
|
||||
outfile.write(data)
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
Library('mozcrt')
|
||||
|
||||
STATIC_LIBRARY_NAME = 'mozcrt_s'
|
||||
|
||||
OS_LIBS += [
|
||||
'-NODEFAULTLIB:msvcrt',
|
||||
'-NODEFAULTLIB:msvcprt',
|
||||
'-LIBPATH:%s/mozglue/crt' % TOPOBJDIR,
|
||||
'-DEFAULTLIB:mozcrt',
|
||||
]
|
||||
|
|
@ -15,8 +15,5 @@ DIRS += [
|
|||
'misc',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_CRT']:
|
||||
DIRS += ['crt']
|
||||
|
||||
if not CONFIG['JS_STANDALONE']:
|
||||
TEST_DIRS += ['tests']
|
||||
|
|
|
|||
|
|
@ -321,12 +321,6 @@ case "$target" in
|
|||
AC_DEFINE(_USE_MATH_DEFINES) # Otherwise MSVC's math.h doesn't #define M_PI.
|
||||
|
||||
case "$CC_VERSION" in
|
||||
18*)
|
||||
_CC_SUITE=12
|
||||
MSVS_VERSION=2013
|
||||
MSVC_C_RUNTIME_DLL=msvcr120.dll
|
||||
MSVC_CXX_RUNTIME_DLL=msvcp120.dll
|
||||
;;
|
||||
19*)
|
||||
_CC_SUITE=14
|
||||
MSVS_VERSION=2015
|
||||
|
|
@ -5357,24 +5351,11 @@ else
|
|||
case "${target}" in
|
||||
*-mingw*)
|
||||
export MOZ_NO_DEBUG_RTL=1
|
||||
if test "$MSVS_VERSION" != "2015"; then
|
||||
WIN32_CRT_LIBS="msvcrt.lib msvcprt.lib"
|
||||
dnl Look for a broken crtdll.obj
|
||||
WIN32_CRTDLL_FULLPATH=`lib -nologo -list $WIN32_CRT_LIBS | grep crtdll\\.obj`
|
||||
lib -NOLOGO -OUT:crtdll.obj $WIN32_CRT_LIBS -EXTRACT:$WIN32_CRTDLL_FULLPATH
|
||||
if grep -q '__imp__\{0,1\}free' crtdll.obj; then
|
||||
MOZ_CRT=1
|
||||
fi
|
||||
rm crtdll.obj
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi # MOZ_MEMORY
|
||||
AC_SUBST(MOZ_SYSTEM_JEMALLOC)
|
||||
AC_SUBST(MOZ_CRT)
|
||||
export MOZ_CRT
|
||||
AC_SUBST(MOZ_GLUE_IN_PROGRAM)
|
||||
AC_SUBST_LIST(WIN32_CRT_LIBS)
|
||||
|
||||
# Allow the application to provide a subconfigure script.
|
||||
# This should be after 'export MOZ_NO_DEBUG_RTL=1' since
|
||||
|
|
|
|||
|
|
@ -38,17 +38,13 @@ def get_id(name):
|
|||
return str(uuid.uuid5(uuid.NAMESPACE_URL, name)).upper()
|
||||
|
||||
def visual_studio_product_to_solution_version(version):
|
||||
if version == '2013':
|
||||
return '12.00', '12'
|
||||
elif version == '2015':
|
||||
if version == '2015':
|
||||
return '12.00', '14'
|
||||
else:
|
||||
raise Exception('Unknown version seen: %s' % version)
|
||||
|
||||
def visual_studio_product_to_platform_toolset_version(version):
|
||||
if version == '2013':
|
||||
return 'v120'
|
||||
elif version == '2015':
|
||||
if version == '2015':
|
||||
return 'v140'
|
||||
else:
|
||||
raise Exception('Unknown version seen: %s' % version)
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@ VS_2013u2 = VS('18.00.30501')
|
|||
VS_2013u3 = VS('18.00.30723')
|
||||
VS_2015 = VS('19.00.23026')
|
||||
VS_2015u1 = VS('19.00.23506')
|
||||
VS_2015u2 = VS('19.00.23918')
|
||||
|
||||
# Note: In reality, the -std=gnu* options are only supported when preceded by
|
||||
# -Xclang.
|
||||
|
|
@ -532,30 +533,31 @@ class WindowsToolchainTest(BaseToolchainTest):
|
|||
'/opt/VS_2013u2/bin/cl': VS_2013u2,
|
||||
'/opt/VS_2013u3/bin/cl': VS_2013u3,
|
||||
'/opt/VS_2015/bin/cl': VS_2015,
|
||||
'/usr/bin/cl': VS_2015u1,
|
||||
'/opt/VS_2015u1/bin/cl': VS_2015u1,
|
||||
'/usr/bin/cl': VS_2015u2,
|
||||
'/usr/bin/clang-cl': CLANG_CL_3_9,
|
||||
}
|
||||
PATHS.update(LinuxToolchainTest.PATHS)
|
||||
|
||||
VS_2013u2_RESULT = (
|
||||
'This version (18.00.30501) of the MSVC compiler is not supported.\n'
|
||||
'You must install Visual C++ 2013 Update 3, Visual C++ 2015 Update 1, '
|
||||
'or newer in order to build.\n'
|
||||
'You must install Visual C++ 2015 Update 2 or newer in order to build.\n'
|
||||
'See https://developer.mozilla.org/en/Windows_Build_Prerequisites')
|
||||
VS_2013u3_RESULT = (
|
||||
'This version (18.00.30723) of the MSVC compiler is not supported.\n'
|
||||
'You must install Visual C++ 2015 Update 2 or newer in order to build.\n'
|
||||
'See https://developer.mozilla.org/en/Windows_Build_Prerequisites')
|
||||
VS_2013u3_RESULT = CompilerResult(
|
||||
flags=[],
|
||||
version='18.00.30723',
|
||||
type='msvc',
|
||||
compiler='/opt/VS_2013u3/bin/cl',
|
||||
)
|
||||
VS_2015_RESULT = (
|
||||
'This version (19.00.23026) of the MSVC compiler is not supported.\n'
|
||||
'You must install Visual C++ 2013 Update 3, Visual C++ 2015 Update 1, '
|
||||
'or newer in order to build.\n'
|
||||
'You must install Visual C++ 2015 Update 2 or newer in order to build.\n'
|
||||
'See https://developer.mozilla.org/en/Windows_Build_Prerequisites')
|
||||
VS_2015u1_RESULT = CompilerResult(
|
||||
VS_2015u1_RESULT = (
|
||||
'This version (19.00.23506) of the MSVC compiler is not supported.\n'
|
||||
'You must install Visual C++ 2015 Update 2 or newer in order to build.\n'
|
||||
'See https://developer.mozilla.org/en/Windows_Build_Prerequisites')
|
||||
VS_2015u2_RESULT = CompilerResult(
|
||||
flags=[],
|
||||
version='19.00.23506',
|
||||
version='19.00.23918',
|
||||
type='msvc',
|
||||
compiler='/usr/bin/cl',
|
||||
)
|
||||
|
|
@ -582,35 +584,38 @@ class WindowsToolchainTest(BaseToolchainTest):
|
|||
GCC_5_RESULT = LinuxToolchainTest.GCC_5_RESULT
|
||||
GXX_5_RESULT = LinuxToolchainTest.GXX_5_RESULT
|
||||
|
||||
# VS2015u2 or greater is required.
|
||||
def test_msvc(self):
|
||||
self.do_toolchain_test(self.PATHS, {
|
||||
'c_compiler': self.VS_2015u1_RESULT,
|
||||
'cxx_compiler': self.VS_2015u1_RESULT,
|
||||
})
|
||||
|
||||
def test_msvc_2013(self):
|
||||
self.do_toolchain_test(self.PATHS, {
|
||||
'c_compiler': self.VS_2013u3_RESULT,
|
||||
'cxx_compiler': self.VS_2013u3_RESULT,
|
||||
}, environ={
|
||||
'CC': '/opt/VS_2013u3/bin/cl',
|
||||
'c_compiler': self.VS_2015u2_RESULT,
|
||||
'cxx_compiler': self.VS_2015u2_RESULT,
|
||||
})
|
||||
|
||||
def test_unsupported_msvc(self):
|
||||
# While 2013 is supported, update 3 or higher is needed.
|
||||
self.do_toolchain_test(self.PATHS, {
|
||||
'c_compiler': self.VS_2013u2_RESULT,
|
||||
'c_compiler': self.VS_2015u1_RESULT,
|
||||
}, environ={
|
||||
'CC': '/opt/VS_2013u2/bin/cl',
|
||||
'CC': '/opt/VS_2015u1/bin/cl',
|
||||
})
|
||||
|
||||
# Likewise with 2015, update 1 or higher is needed.
|
||||
self.do_toolchain_test(self.PATHS, {
|
||||
'c_compiler': self.VS_2015_RESULT,
|
||||
}, environ={
|
||||
'CC': '/opt/VS_2015/bin/cl',
|
||||
})
|
||||
|
||||
self.do_toolchain_test(self.PATHS, {
|
||||
'c_compiler': self.VS_2013u3_RESULT,
|
||||
}, environ={
|
||||
'CC': '/opt/VS_2013u3/bin/cl',
|
||||
})
|
||||
|
||||
self.do_toolchain_test(self.PATHS, {
|
||||
'c_compiler': self.VS_2013u2_RESULT,
|
||||
}, environ={
|
||||
'CC': '/opt/VS_2013u2/bin/cl',
|
||||
})
|
||||
|
||||
def test_clang_cl(self):
|
||||
# We'll pick clang-cl if msvc can't be found.
|
||||
paths = {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче