Bug 1115944 - Work around race condition between building NSPR and NSS. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 04 Nov 2016 17:06:51 +0900
changeset 321179 b439e504fc3e9382a3cb1a83c220f2f5206b1f61
parent 321178 f665524289ef0a83b4917f192b4808a4f195bc29
child 321180 4c050d33b8424ef92cf6cfe6befb135dd18b80be
push id83538
push userphilringnalda@gmail.com
push dateSat, 05 Nov 2016 04:05:02 +0000
treeherdermozilla-inbound@5da65f1ef193 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1115944
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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