summaryrefslogtreecommitdiff
path: root/external/nss
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2016-05-05 01:31:07 -0700
committerAndras Timar <andras.timar@collabora.com>2016-05-05 01:40:10 -0700
commitc04c44aa5f7ca95d0c3cc3d0e45140f70771486a (patch)
tree7a4dff1788ecb3ae8a2f8ec44618ca3ce2e88fe4 /external/nss
parent79a6c1771ce2517b6ba58cccc1e10a93352ed5aa (diff)
nss: win vs2013 build fixcp-4.4-13distro/collabora/cp-4.4
Change-Id: Iecdd4adb05b6f6f6217d964e43a3286315302fdc
Diffstat (limited to 'external/nss')
-rw-r--r--external/nss/UnpackedTarball_nss.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index 383fd71b45d8..f7409e1bb1b5 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -17,8 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \
external/nss/nss-win32-make.patch.1 \
- $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch \
- external/nss/nss.vs2015.patch) \
+ $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \