diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-02-21 16:26:55 -0600 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 17:23:08 +0100 |
| commit | 8425ac5c49d3844d04b3be3eddd841ce1902bf2c (patch) | |
| tree | c68ad5bb53b9d7cdc59f84e702eca86775216506 /external | |
| parent | Work around apprently rounding issue in test with retina mac. (diff) | |
| download | core-8425ac5c49d3844d04b3be3eddd841ce1902bf2c.tar.gz core-8425ac5c49d3844d04b3be3eddd841ce1902bf2c.zip | |
WaE vs2015 double define
Change-Id: I279b5df3f9705ca266f2f4efb1e93e59cbbdabd7
Reviewed-on: https://gerrit.libreoffice.org/22603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 3e1782f05b9217d941eeff821df98df5f3e8da76)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 37b05c9fadf1..c3a4ef6225e2 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -26,7 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/python-3.3.0-pythreadstate.patch.1 \ external/python3/python-3.3.0-clang.patch.1 \ external/python3/python-3.3.5-pyexpat-symbols.patch.1 \ - external/python3/python-3.3.5-vs2013.patch.1 \ + $(if $(filter 120,$(VCVER)), external/python3/python-3.3.5-vs2013.patch.1) \ external/python3/python-lsan.patch.0 \ external/python3/ubsan.patch.0 \ external/python3/python-3.5.tweak.strip.soabi.patch \ |