Bug 898431: Update NSS to NSS 3.15.4 beta 6 (NSS_3_15_4_BETA6), r=me

--HG--
extra : rebase_source : 9f497ceb1c74fbf15938171229f5a7339e277333
This commit is contained in:
Brian Smith 2013-12-03 20:04:07 -08:00
parent bf0cda8ba3
commit 171a474447
3 changed files with 5 additions and 4 deletions

View File

@ -1 +1 @@
NSS_3_15_4_BETA5
NSS_3_15_4_BETA6

View File

@ -25,7 +25,7 @@ else
CCC = cl
LINK = link
AR = lib
AR += -NOLOGO -OUT:"$@"
AR += -NOLOGO -OUT:$@
RANLIB = echo
BSDECHO = echo
RC = rc.exe
@ -130,7 +130,7 @@ else # !NS_USE_GCC
OPTIMIZER += -O2
endif
DEFINES += -UDEBUG -U_DEBUG -DNDEBUG
DLLFLAGS += -OUT:"$@"
DLLFLAGS += -OUT:$@
ifdef MOZ_DEBUG_SYMBOLS
ifdef MOZ_DEBUG_FLAGS
OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/
@ -156,7 +156,7 @@ else # !NS_USE_GCC
USERNAME := $(subst $(SPACE),_,$(USERNAME))
USERNAME := $(subst -,_,$(USERNAME))
DEFINES += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
DLLFLAGS += -DEBUG -OUT:"$@"
DLLFLAGS += -DEBUG -OUT:$@
LDFLAGS += -DEBUG
ifeq ($(_MSC_VER),$(_MSC_VER_6))
ifndef MOZ_DEBUG_SYMBOLS

View File

@ -10,3 +10,4 @@
*/
#error "Do not include this header file."