Commit 1a0ac04b authored by Zhengchao Liu's avatar Zhengchao Liu Committed by Facebook GitHub Bot

upgrade to VC++ 2019

Summary:
Allow a Facebook-specific vcvarsall to be used. The getdeps default of
MSVC 2017 had at least one annoying bug fixed in 2019.

Reviewed By: chadaustin

Differential Revision: D31188039

fbshipit-source-id: 1f569fe1c5f4ceb68f0ddd339e6de3c8ca07588b
parent c7e3550f
......@@ -105,6 +105,18 @@ class BuildOptions(object):
self.lfs_path = lfs_path
if vcvars_path is None and is_windows():
try:
# Allow a site-specific vcvarsall path.
from .facebook.vcvarsall import build_default_vcvarsall
except ImportError:
vcvarsall = []
else:
vcvarsall = (
build_default_vcvarsall(self.fbsource_dir)
if self.fbsource_dir is not None
else []
)
# On Windows, the compiler is not available in the PATH by
# default so we need to run the vcvarsall script to populate the
# environment. We use a glob to find some version of this script
......@@ -113,7 +125,6 @@ class BuildOptions(object):
# the version of boost in our manifest cannot be built with
# VS 2019, so we're effectively tied to VS 2017 until we upgrade
# the boost dependency.
vcvarsall = []
for year in ["2017", "2019"]:
vcvarsall += glob.glob(
os.path.join(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment