Bug 1318798 - Remove config/external/nss/target in recurse.mk. r=ted
authorRichard Marti <richard.marti@gmail.com>
Sat, 19 Nov 2016 16:15:35 +0100
changeset 323551 9f8700acec463beb0f1d37bcd3946a69a152f7a3
parent 323550 f0f88a94e698007fa2cecf579e2077447aae0e0d
child 323552 e79129082f4a6e327d20cf8d88324fd517277b7b
push id21
push usermaklebus@msu.edu
push dateThu, 01 Dec 2016 06:22:08 +0000
reviewersted
bugs1318798
milestone53.0a1
Bug 1318798 - Remove config/external/nss/target in recurse.mk. r=ted MozReview-Commit-ID: 884NGQYXfQl
config/recurse.mk
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -160,21 +160,18 @@ build/clang-plugin/tests/target: build/c
 endif
 
 # Interdependencies that moz.build world don't know about yet for compilation.
 # Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
 toolkit/library/target: widget/gtk/mozgtk/gtk3/target
 endif
 ifdef MOZ_LDAP_XPCOM
-ldap/target: config/external/nss/target mozglue/build/target
+ldap/target: security/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_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