diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-06-18 23:11:43 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2019-06-18 23:11:43 (GMT) |
| commit | 488d852d52c757bcf87cb7c1c9fdbdb0828a44ef (patch) | |
| tree | e55e96df9a105f48ae4b8a32d940fb8c9197a308 /src/engine | |
| parent | 91cf45e5e5e71c644f0216b93ff5af7f6fc513e5 (diff) | |
| download | SCons-488d852d52c757bcf87cb7c1c9fdbdb0828a44ef.zip SCons-488d852d52c757bcf87cb7c1c9fdbdb0828a44ef.tar.gz SCons-488d852d52c757bcf87cb7c1c9fdbdb0828a44ef.tar.bz2 | |
Fix conflict
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index e43d0bb..1485b8c 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -483,13 +483,8 @@ def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version): return False host_trgt_dir = _HOST_TARGET_TO_CL_DIR_GREATER_THAN_14.get((host_platform, target_platform), None) -<<<<<<< Updated upstream - if not host_trgt_dir: - debug('_check_cl_exists_in_vc_dir(): unsupported host/target platform combo') -======= if host_trgt_dir is None: debug('_check_cl_exists_in_vc_dir(): unsupported host/target platform combo: (%s,%s)'%(host_platform, target_platform)) ->>>>>>> Stashed changes return False cl_path = os.path.join(vc_dir, 'Tools','MSVC', vc_specific_version, 'bin', host_trgt_dir[0], host_trgt_dir[1], _CL_EXE_NAME) |