Bug 1315882 - Unbreak --with-system-nspr after bug 1115944. r?glandium draft
authorJan Beich <jbeich@FreeBSD.org>
Tue, 08 Nov 2016 06:44:36 +0000
changeset 435233 761bb64f3487faf78e9aac861e1c268b1a6e01c1
parent 435182 f13e90d496cf1bc6dfc4fd398da33e4afe785bde
child 536246 28381c6df71c4017226530b2801a306f488293bd
push id34968
push userbmo:jbeich@FreeBSD.org
push dateTue, 08 Nov 2016 06:54:24 +0000
reviewersglandium
bugs1315882, 1115944
milestone52.0a1
Bug 1315882 - Unbreak --with-system-nspr after bug 1115944. r?glandium MozReview-Commit-ID: H9A63lwCasG
config/recurse.mk
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -167,14 +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))
+ifeq (,$(MOZ_SYSTEM_NSPR)$(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