Merge pull request #63722 from akien-mga/scons-4.4.0-vs-solution

SCons: Fix creating VS solution with SCons 4.4.0
This commit is contained in:
Rémi Verschelde
2022-08-01 10:31:46 +02:00
committed by GitHub

View File

@@ -607,8 +607,18 @@ def find_visual_c_batch_file(env):
find_batch_file,
)
# Syntax changed in SCons 4.4.0.
from SCons import __version__ as scons_raw_version
scons_ver = env._get_major_minor_revision(scons_raw_version)
version = get_default_version(env)
(host_platform, target_platform, _) = get_host_target(env)
if scons_ver >= (4, 4, 0):
(host_platform, target_platform, _) = get_host_target(env, version)
else:
(host_platform, target_platform, _) = get_host_target(env)
return find_batch_file(env, version, host_platform, target_platform)[0]