Bug 1315882 - Unbreak --with-system-nspr after bug 1115944. r=glandium
authorJan Beich <jbeich@FreeBSD.org>
Tue, 08 Nov 2016 06:44:36 +0000
changeset 348335 17198099ff27d75333e6b15a1786da06ab3b2bb8
parent 348334 c669673b4192490d93d7a3120301ba93fabbf623
child 348336 d680b3accfc56cf836afed0db24ebee55ae855e4
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
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