From 6ac04c37e028312fa9daaf03a880153b6f0a29af Mon Sep 17 00:00:00 2001 From: antonio Date: Sat, 15 Jun 2013 17:33:18 +0100 Subject: fix for visual studio expres on win7 x86_64 (transplanted from d7e892b4978439c6374d090912f13afa13e8daf8) --- src/engine/SCons/Tool/MSCommon/vc.py | 11 ++++++----- 1 file 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) -- cgit v0.12