Bug 1115944 - Work around race condition between building NSPR and NSS. r?mshal draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 04 Nov 2016 17:06:51 +0900
changeset 433761 3a516a82fd6035f560303827743ca072b67fef83
parent 431855 37ab1d54a08e7e1431660b22377428b74dcd090a
child 535947 eea829630cce8d67f9eacc82659ae0acb885aa9d
push id34641
push userbmo:mh+mozilla@glandium.org
push dateFri, 04 Nov 2016 08:07:57 +0000
reviewersmshal
bugs1115944
milestone52.0a1
Bug 1115944 - Work around race condition between building NSPR and NSS. r?mshal
config/recurse.mk
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -167,11 +167,14 @@ endif
 ifdef MOZ_LDAP_XPCOM
 ldap/target: config/external/nss/target mozglue/build/target
 toolkit/library/target: ldap/target
 endif
 ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)
 mozglue/build/target memory/replace/logalloc/replay/target: memory/replace/dummy/target
 endif
 endif
+ifeq (,$(MOZ_SYSTEM_NSS)$(MOZ_FOLD_LIBS))
+config/external/nss/target: config/external/nspr/pr/target config/external/nspr/ds/target config/external/nspr/libc/target
+endif
 # Most things are built during compile (target/host), but some things happen during export
 # Those need to depend on config/export for system wrappers.
 $(addprefix build/unix/stdc++compat/,target host) build/clang-plugin/target: config/export