gecko/security/patches/bug-832272.patch
Wan-Teh Chang d2e338b885 Bug 858231: Update NSS to NSS 3.15 Beta 3, with local patches
bug-835919.patch and bug-835919.patch. r=wtc.
Bug 866525: Add AddressSanitizer annotations to port_ArenaZeroAfterMark.
r=choller.

Also include fixes for bug 866363, bug 866949, bug 835919, bug 863871.
2013-05-02 16:10:01 -07:00

25 lines
748 B
Diff

# HG changeset patch
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1367461929 25200
# Node ID 514f784e0402a4c5878fc62ab24c54c7646f015e
# Parent 44a46d334735e8c21b7d843780dbb520677aa668
Bug 867861 and Bug 832272: Avoid certdata.c being created before
$(OBJDIR) is. r=kaie,wtc.
diff --git a/lib/ckfw/builtins/Makefile b/lib/ckfw/builtins/Makefile
--- a/lib/ckfw/builtins/Makefile
+++ b/lib/ckfw/builtins/Makefile
@@ -45,9 +45,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# Generate certdata.c.
# By default, use the unmodified certdata.txt.
ifndef NSS_CERTDATA_TXT
NSS_CERTDATA_TXT = certdata.txt
endif
$(OBJDIR)/certdata.c: $(NSS_CERTDATA_TXT) certdata.perl
+ @$(MAKE_OBJDIR)
$(PERL) certdata.perl < $(NSS_CERTDATA_TXT) > $@