summaryrefslogtreecommitdiffstats
path: root/build/moz.configure/windows.configure
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-09-04 12:14:54 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-09-04 12:14:54 +0200
commitcc60a093cb65745602dc1f5eab9f5e328ddaad15 (patch)
treedac830b232c66806fdb46bd82f59ceaed282d2d1 /build/moz.configure/windows.configure
parent7c09f0ed7e3bbc2f4da4df7496478594b4f0fa0e (diff)
parent44cfc6d210eec360b4eec333b14bef3fcbac2f60 (diff)
downloadUXP-cc60a093cb65745602dc1f5eab9f5e328ddaad15.tar
UXP-cc60a093cb65745602dc1f5eab9f5e328ddaad15.tar.gz
UXP-cc60a093cb65745602dc1f5eab9f5e328ddaad15.tar.lz
UXP-cc60a093cb65745602dc1f5eab9f5e328ddaad15.tar.xz
UXP-cc60a093cb65745602dc1f5eab9f5e328ddaad15.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'build/moz.configure/windows.configure')
-rw-r--r--build/moz.configure/windows.configure12
1 files changed, 8 insertions, 4 deletions
diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure
index b9a3898a1..631049566 100644
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -361,10 +361,10 @@ set_config('LIB', lib_path)
option(env='MT', nargs=1, help='Path to the Microsoft Manifest Tool')
-@depends_win(valid_windows_sdk_dir)
+@depends_win(valid_windows_sdk_dir, valid_ucrt_sdk_dir)
@imports(_from='os', _import='environ')
@imports('platform')
-def sdk_bin_path(valid_windows_sdk_dir):
+def sdk_bin_path(valid_windows_sdk_dir, valid_ucrt_sdk_dir):
if not valid_windows_sdk_dir:
return
@@ -373,13 +373,17 @@ def sdk_bin_path(valid_windows_sdk_dir):
'AMD64': 'x64',
}.get(platform.machine())
+ # From version 10.0.15063.0 onwards the bin path contains the version number.
+ versioned_bin = ('bin' if valid_ucrt_sdk_dir.version < '10.0.15063.0'
+ else os.path.join('bin', str(valid_ucrt_sdk_dir.version)))
+
result = [
environ['PATH'],
- os.path.join(valid_windows_sdk_dir.path, 'bin', vc_host)
+ os.path.join(valid_windows_sdk_dir.path, versioned_bin, vc_host)
]
if vc_host == 'x64':
result.append(
- os.path.join(valid_windows_sdk_dir.path, 'bin', 'x86'))
+ os.path.join(valid_windows_sdk_dir.path, versioned_bin, 'x86'))
return result