diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-10-22 12:21:46 -0700 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-10-23 01:07:29 +0530 |
| commit | 3fb4d5cf3a3d893d8505977e6cda371fb0648efd (patch) | |
| tree | 180e052c7d08c0d8c4498d16875d734553b1ec24 /config | |
| parent | cee2200a70f7b3b58c2db00b258d268de03b9aa6 (diff) | |
cerbero/msvc: Slightly rework MSVC env fetching
Instead of computing the vcvarsall at the module level, add a function
for it and use that. This also allows us to target a specific version
of Visual Studio (2015/2017/etc).
Diffstat (limited to 'config')
| -rw-r--r-- | config/windows.config | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/windows.config b/config/windows.config index a7538637..cd5b20b0 100644 --- a/config/windows.config +++ b/config/windows.config @@ -87,15 +87,17 @@ if platform == Platform.WINDOWS: allow_parallel_build = False os.environ['ACLOCAL'] = 'aclocal-1.11' + # We use Visual Studio by default on Windows if 'novisualstudio' not in variants: variants.append('visualstudio') - from cerbero.ide.vs.env import vcvarsall, get_msvc_env, append_path + + from cerbero.ide.vs.env import get_msvc_env, append_path # Contains only the env vars that MSVC needs, including any existing vars # that were appended/prepended and have new values # FIXME: Use EnvVarOp class from cerbero/build/build.py msvc_toolchain_env = {} - for key, value in get_msvc_env(vcvarsall, arch, target_arch).items(): + for key, value in get_msvc_env(arch, target_arch).items(): if key in ('PATH', 'PATHEXT', 'INCLUDE', 'LIB'): sep = separator else: |