From 1a056fdb25bd5c682f395ff94a6e1ce5618ed55a Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 4 Mar 2016 19:55:16 +0100 Subject: Fix nss on MSVC 14.0 in debug mode outdir doesn't seem to be created. Use current directory for pdb files as the obj files are already stored in the current directory. Change-Id: I41dd65714d314cd374cc5de073d48f1a58b18c56 Reviewed-on: https://gerrit.libreoffice.org/22888 Tested-by: Jenkins Reviewed-by: Norbert Thiebaud --- external/nss/UnpackedTarball_nss.mk | 2 ++ external/nss/nss.vs2015.pdb.patch | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100755 external/nss/nss.vs2015.pdb.patch (limited to 'external') diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 2d960b8bb7e5..75b1f8443e48 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -30,6 +30,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-ios.patch) \ $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \ external/nss/nss.cygwin64.in32bit.patch) \ + $(if $(filter WNTMSC,$(OS)$(COM)), \ + external/nss/nss.vs2015.pdb.patch) \ )) # nss-pem is only needed for internal curl to read the NSS CA database diff --git a/external/nss/nss.vs2015.pdb.patch b/external/nss/nss.vs2015.pdb.patch new file mode 100755 index 000000000000..dc4f4638b476 --- /dev/null +++ b/external/nss/nss.vs2015.pdb.patch @@ -0,0 +1,22 @@ +diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk +--- a/nss.orig/nss/coreconf/WIN32.mk 2016-03-04 08:30:16.306639400 +0100 ++++ b/nss/nss/coreconf/WIN32.mk 2016-03-04 08:31:17.987233200 +0100 +@@ -169,15 +169,15 @@ + DLLFLAGS += -OUT:$@ + ifdef MOZ_DEBUG_SYMBOLS + ifdef MOZ_DEBUG_FLAGS +- OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/ ++ OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd./ + else +- OPTIMIZER += -Zi -Fd$(OBJDIR)/ ++ OPTIMIZER += -Zi -Fd./ + endif + DLLFLAGS += -DEBUG -OPT:REF + LDFLAGS += -DEBUG -OPT:REF + endif + else +- OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od ++ OPTIMIZER += -Zi -Fd./ -Od + NULLSTRING := + SPACE := $(NULLSTRING) # end of the line + USERNAME := $(subst $(SPACE),_,$(USERNAME)) -- cgit