diff options
| author | antonio <devnull@localhost> | 2013-06-15 16:33:18 (GMT) |
|---|---|---|
| committer | antonio <devnull@localhost> | 2013-06-15 16:33:18 (GMT) |
| commit | 6ac04c37e028312fa9daaf03a880153b6f0a29af (patch) | |
| tree | db1facd193c62b91d38bf1eb3d0eef8b789a845a /src/engine/SCons/Tool/MSCommon | |
| parent | b20c2218feb24b73a3d985b1f8121e601e930f45 (diff) | |
| download | SCons-6ac04c37e028312fa9daaf03a880153b6f0a29af.zip SCons-6ac04c37e028312fa9daaf03a880153b6f0a29af.tar.gz SCons-6ac04c37e028312fa9daaf03a880153b6f0a29af.tar.bz2 | |
fix for visual studio expres on win7 x86_64
(transplanted from d7e892b4978439c6374d090912f13afa13e8daf8)
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 1266ee8..818475c 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -258,13 +258,14 @@ def find_batch_file(env,msvc_version,host_arch,target_arch): installed_sdks=get_installed_sdks() for _sdk in installed_sdks: - sdk_bat_file=_sdk.get_sdk_vc_script(host_arch,target_arch) - sdk_bat_file_path=os.path.join(pdir,sdk_bat_file) - debug('vc.py:find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path) - if os.path.exists(sdk_bat_file_path): + sdk_bat_file = _sdk.get_sdk_vc_script(host_arch,target_arch) + if sdk_bat_file and os.path.join(pdir,sdk_bat_file): + sdk_bat_file_path = os.path.join(pdir,sdk_bat_file) + debug('vc.py:find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path) + return (batfilename,sdk_bat_file_path) else: - debug("vc.py:find_batch_file() not found:%s"%sdk_bat_file_path) + debug("vc.py:find_batch_file() not found:%s"%_sdk) else: return (batfilename,None) |