diff options
| author | Daniel <dmoody256@gmail.com> | 2019-01-13 22:01:37 (GMT) |
|---|---|---|
| committer | Daniel <dmoody256@gmail.com> | 2019-01-14 04:00:07 (GMT) |
| commit | 03a1cb0d3117ce297030010a813e14551185d99d (patch) | |
| tree | d42d45acb5198599f6732f17e8939c18bda1418d /src | |
| parent | 265a1e44514ab909167d8aea11369f6006a2818a (diff) | |
| download | SCons-03a1cb0d3117ce297030010a813e14551185d99d.zip SCons-03a1cb0d3117ce297030010a813e14551185d99d.tar.gz SCons-03a1cb0d3117ce297030010a813e14551185d99d.tar.bz2 | |
accidently moved a change in CHANGES.txt, moving it back
removed unused function
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 8925d5a..a12fedb 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -14,7 +14,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Improved support for VC14.1 and Visual Studio 2017, as well as arm and arm64 targets. From Mats Wichmann: - - Update doc examples to work with Python 3.5+: map() now returns an iterable instead of a list. - Improve finding of Microsoft compiler: add a 'products' wildcard in case 2017 Build Tools only is installed as it is considered a separate product from the default Visual Studio @@ -29,6 +28,10 @@ RELEASE 3.0.3 - Mon, 07 Jan 2019 20:05:22 -0400 - Modify scons.bat script to check for scons python script without .py extension if no file scons.py exists. This enables an all platform wheel to work. + From Mats Wichmann: + - Update doc examples to work with Python 3.5+: map() now returns an iterable instead of a list. + + RELEASE 3.0.2 - Mon, 31 Dec 2018 16:00:12 -0700 From Bernard Blackham: diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 67f3dcc..8cc85f6 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -413,20 +413,6 @@ def find_batch_file(env,msvc_version,host_arch,target_arch): __INSTALLED_VCS_RUN = None -def _get_host_target_dir(host_platform, target_platform): - - host_target_dir = _HOST_TARGET_ARCH_TO_BAT_ARCH.get((host_platform, target_platform), False) - - if not host_target_dir: - debug('_check_cl_exists_in_vc_dir(): unsupported host/target combination' + host_target_dir) - return False - elif host_target_dir in 'x86': - host_target_dir == '' - else: - host_target_dir += '\\' - - return host_target_dir - def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version): """Find the cl.exe on the filesystem in the vc_dir depending on TARGET_ARCH, HOST_ARCH and the msvc version. TARGET_ARCH and |