Browse Source

SCons: Fix creating VS solution with SCons 4.4.0

Fixes #63709.

Co-authored-by: 19PHOBOSS98 <[email protected]>
Rémi Verschelde 3 years ago
parent
commit
89847dc6e3
1 changed files with 11 additions and 1 deletions
  1. 11 1
      methods.py

+ 11 - 1
methods.py

@@ -607,8 +607,18 @@ def find_visual_c_batch_file(env):
         find_batch_file,
         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)
     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]
     return find_batch_file(env, version, host_platform, target_platform)[0]