diff options
| author | Steven Knight <knight@baldmt.com> | 2009-07-21 14:24:00 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-07-21 14:24:00 (GMT) |
| commit | 2f1f13cae417794fa64f17ce398367e9b19f010c (patch) | |
| tree | c32cf386db29c94a6c2835962405fe3a495ef351 /src | |
| parent | faa90701aa4a9d3e2ed9882e967b34f6e6d5389e (diff) | |
| download | SCons-2f1f13cae417794fa64f17ce398367e9b19f010c.zip SCons-2f1f13cae417794fa64f17ce398367e9b19f010c.tar.gz SCons-2f1f13cae417794fa64f17ce398367e9b19f010c.tar.bz2 | |
Fix execution of test/MSV[CS]/*.py tests on non-Windows systems by
not assuming that %PROCESSOR_ARCHITECTURE% will be defined, and not
assuming that we'll find any installed Windows SDKs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/sdk.py | 2 |
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): |