forked from mirrors/gecko-dev
Bug 1424281 - Use Visual Studio 2017 15.6.0 for Windows builds. r=froydnj
--HG-- extra : rebase_source : 2d5abb19c1f2b2e2f142b849bd4d0ba9ab46ccbe
This commit is contained in:
Ryan VanderMeulen
parent
02df77788a
commit
dde54aa578
10 changed files with 27 additions and 26 deletions
|
|
@ -6,11 +6,11 @@
|
|||
"filename": "mozmake.exe"
|
||||
},
|
||||
{
|
||||
"version": "Visual Studio 2017 15.4.2 / SDK 10.0.15063.0",
|
||||
"digest": "18700889e6b5e81613b9cf57ce4e0d46a6ee45bb4c5c33bae2604a5275326128775b8a032a1eb178c5db973746d565340c4e36d98375789e1d5bd836ab16ba58",
|
||||
"size": 303146863,
|
||||
"version": "Visual Studio 2017 15.6.0 / SDK 10.0.15063.0",
|
||||
"digest": "f99285fa6328da3c21839adabe6fc4dd1a792bcb6048a491ba7617a8ce3d0e21f8d18e9de03b65c90ce5bf37073637ba7c1497fb21ce920b6794d2c9819b4f9e",
|
||||
"size": 309779153,
|
||||
"algorithm": "sha512",
|
||||
"filename": "vs2017_15.4.2.zip",
|
||||
"filename": "vs2017_15.6.0.zip",
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
"filename": "mozmake.exe"
|
||||
},
|
||||
{
|
||||
"version": "Visual Studio 2017 15.4.2 / SDK 10.0.15063.0",
|
||||
"digest": "18700889e6b5e81613b9cf57ce4e0d46a6ee45bb4c5c33bae2604a5275326128775b8a032a1eb178c5db973746d565340c4e36d98375789e1d5bd836ab16ba58",
|
||||
"size": 303146863,
|
||||
"version": "Visual Studio 2017 15.6.0 / SDK 10.0.15063.0",
|
||||
"digest": "f99285fa6328da3c21839adabe6fc4dd1a792bcb6048a491ba7617a8ce3d0e21f8d18e9de03b65c90ce5bf37073637ba7c1497fb21ce920b6794d2c9819b4f9e",
|
||||
"size": 309779153,
|
||||
"algorithm": "sha512",
|
||||
"filename": "vs2017_15.4.2.zip",
|
||||
"filename": "vs2017_15.6.0.zip",
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -528,7 +528,7 @@ if __name__ == "__main__":
|
|||
# by looking at an MSVC install, but we don't really have that here.
|
||||
# Force things on.
|
||||
extra_cflags2 = []
|
||||
extra_cxxflags2 = ['-fms-compatibility-version=19.11.25547', '-Xclang', '-std=c++14']
|
||||
extra_cxxflags2 = ['-fms-compatibility-version=19.13.26128', '-Xclang', '-std=c++14']
|
||||
extra_asmflags = []
|
||||
extra_ldflags = []
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ of Windows 7 or 10 (such as in a VM). Installing all updates through
|
|||
Windows Update is not only acceptable - it is encouraged. Although it
|
||||
shouldn't matter.
|
||||
|
||||
Next, install Visual Studio 2015 Community. The download link can be
|
||||
found at https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx.
|
||||
Next, install Visual Studio 2017 Community. The download link can be found
|
||||
at https://www.visualstudio.com/vs/community/.
|
||||
Be sure to follow these install instructions:
|
||||
|
||||
1. Choose a ``Custom`` installation and click ``Next``
|
||||
|
|
@ -47,11 +47,11 @@ Be sure to follow these install instructions:
|
|||
``Universal Windows App Development Tools`` and the items under it
|
||||
(should be ``Tools (1.3.1)...`` and the ``Windows 10 SDK``).
|
||||
|
||||
Once Visual Studio 2015 Community has been installed, from a checkout
|
||||
Once Visual Studio 2017 Community has been installed, from a checkout
|
||||
of mozilla-central, run something like the following to produce a ZIP
|
||||
archive::
|
||||
|
||||
$ ./mach python build/windows_toolchain.py create-zip vs2017_15.4.2
|
||||
$ ./mach python build/windows_toolchain.py create-zip vs2017_15.6.0
|
||||
|
||||
The produced archive will be the argument to ``create-zip`` + ``.zip``.
|
||||
|
||||
|
|
|
|||
|
|
@ -507,11 +507,12 @@ def check_compiler(compiler, language, target):
|
|||
cxx14_version):
|
||||
append_flag('-std=gnu++14')
|
||||
|
||||
# We force clang-cl to emulate Visual C++ 2017 version 15.4
|
||||
if info.type == 'clang-cl' and info.version != '19.11.25547':
|
||||
# We force clang-cl to emulate Visual C++ 2017 version 15.6.0
|
||||
msvc_version = '19.13.26128'
|
||||
if info.type == 'clang-cl' and info.version != msvc_version:
|
||||
# This flag is a direct clang-cl flag that doesn't need -Xclang,
|
||||
# add it directly.
|
||||
flags.append('-fms-compatibility-version=19.11.25547')
|
||||
flags.append('-fms-compatibility-version=%s' % msvc_version)
|
||||
|
||||
# Check compiler target
|
||||
# --------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
if [ -z "${VSPATH}" ]; then
|
||||
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.4.2"
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.6.0"
|
||||
fi
|
||||
|
||||
if [ -d "${VSPATH}" ]; then
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
if [ -z "${VSPATH}" ]; then
|
||||
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.4.2"
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.6.0"
|
||||
fi
|
||||
|
||||
if [ -d "${VSPATH}" ]; then
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ PATTERNS = [
|
|||
],
|
||||
},
|
||||
{
|
||||
'srcdir': '%(vs_path)s/VC/Tools/MSVC/14.11.25503',
|
||||
'srcdir': '%(vs_path)s/VC/Tools/MSVC/14.13.26128',
|
||||
'dstdir': 'VC',
|
||||
'files': [
|
||||
# ATL is needed by Breakpad.
|
||||
|
|
@ -86,7 +86,7 @@ PATTERNS = [
|
|||
],
|
||||
},
|
||||
{
|
||||
'srcdir': '%(vs_path)s/VC/Redist/MSVC/14.11.25325',
|
||||
'srcdir': '%(vs_path)s/VC/Redist/MSVC/14.13.26020',
|
||||
'dstdir': 'VC/redist',
|
||||
'files': [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ topsrcdir="$SOURCE"
|
|||
# Tooltool installs in parent of topsrcdir for spidermonkey builds.
|
||||
# Resolve that path since the mozconfigs assume tooltool installs in
|
||||
# topsrcdir.
|
||||
export VSPATH="$(cd ${topsrcdir}/.. && pwd)/vs2017_15.4.2"
|
||||
export VSPATH="$(cd ${topsrcdir}/.. && pwd)/vs2017_15.6.0"
|
||||
|
||||
# When running on a developer machine, several variables will already
|
||||
# have the right settings and we will need to keep them since the
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ CLANG_CL_3_9 = (CLANG_BASE('3.9.0') + VS('18.00.00000') + DEFAULT_C11 +
|
|||
'__STDC_VERSION__': False,
|
||||
'__cplusplus': '201103L',
|
||||
},
|
||||
'-fms-compatibility-version=19.11.25547': VS('19.11.25547')[None],
|
||||
'-fms-compatibility-version=19.13.26128': VS('19.13.26128')[None],
|
||||
}
|
||||
|
||||
CLANG_CL_PLATFORM_X86 = FakeCompiler(VS_PLATFORM_X86, GCC_PLATFORM_X86[None])
|
||||
|
|
@ -899,16 +899,16 @@ class WindowsToolchainTest(BaseToolchainTest):
|
|||
)
|
||||
CLANG_CL_3_9_RESULT = CompilerResult(
|
||||
flags=['-Xclang', '-std=gnu99',
|
||||
'-fms-compatibility-version=19.11.25547'],
|
||||
version='19.11.25547',
|
||||
'-fms-compatibility-version=19.13.26128'],
|
||||
version='19.13.26128',
|
||||
type='clang-cl',
|
||||
compiler='/usr/bin/clang-cl',
|
||||
language='C',
|
||||
)
|
||||
CLANGXX_CL_3_9_RESULT = CompilerResult(
|
||||
flags=['-Xclang', '-std=c++14',
|
||||
'-fms-compatibility-version=19.11.25547'],
|
||||
version='19.11.25547',
|
||||
'-fms-compatibility-version=19.13.26128'],
|
||||
version='19.13.26128',
|
||||
type='clang-cl',
|
||||
compiler='/usr/bin/clang-cl',
|
||||
language='C++',
|
||||
|
|
|
|||
Loading…
Reference in a new issue