summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Platform/win32.py4
-rw-r--r--src/engine/SCons/Tool/MSCommon/sdk.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index 78822c6..bcdc50a 100644
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -281,8 +281,8 @@ def get_architecture(arch=None):
if arch is None:
arch = os.environ.get('PROCESSOR_ARCHITEW6432')
if not arch:
- arch = os.environ['PROCESSOR_ARCHITECTURE']
- return SupportedArchitectureMap.get(arch, '')
+ arch = os.environ.get('PROCESSOR_ARCHITECTURE')
+ return SupportedArchitectureMap.get(arch, ArchDefinition('', ['']))
def generate(env):
# Attempt to find cmd.exe (for WinNT/2k/XP) or
diff --git a/src/engine/SCons/Tool/MSCommon/sdk.py b/src/engine/SCons/Tool/MSCommon/sdk.py
index d9f609c..eb7ed38 100644
--- a/src/engine/SCons/Tool/MSCommon/sdk.py
+++ b/src/engine/SCons/Tool/MSCommon/sdk.py
@@ -259,6 +259,8 @@ def get_sdk_by_version(mssdk):
def get_default_sdk():
"""Set up the default Platform/Windows SDK."""
get_installed_sdks()
+ if not InstalledSDKList:
+ return None
return InstalledSDKList[0]
def mssdk_setup_env(env):