Bug 913968 - Don't link nspr libraries until the libs tier on non-MOZ_FOLD_LIBS builds. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 10 Sep 2013 07:12:10 +0900
changeset 146218 740094c07328b57ade70fb279022641eafb02ba3
parent 146217 24af5272b52f75bb44116fa46b81c3ea013f11bd
child 146219 b1b292d8e383959cbd403a9b739f86e429ce8aab
push id25246
push usermh@glandium.org
push dateMon, 09 Sep 2013 22:13:05 +0000
treeherdermozilla-central@740094c07328 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs913968
milestone26.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 913968 - Don't link nspr libraries until the libs tier on non-MOZ_FOLD_LIBS builds. r=khuey
config/nspr/Makefile.in
--- a/config/nspr/Makefile.in
+++ b/config/nspr/Makefile.in
@@ -18,16 +18,20 @@ ABS_DIST = $(call core_abspath,$(DIST))
 ifdef MOZ_FOLD_LIBS
 # Trick the nspr build system into not building shared libraries.
 # bug #851869.
 EXTRA_MAKE_FLAGS := SHARED_LIBRARY= IMPORT_LIBRARY= SHARED_LIB_PDB=
 
 # Work around libVersionPoint conflict between all three libraries.
 # See bug #838566.
 EXTRA_MAKE_FLAGS += XP_DEFINE=-DlibVersionPoint='libVersionPoint$$(LIBRARY_NAME)'
+else
+# nspr's make export compiles and links everything, but linking can't happen
+# during export on platforms where nspr is linked against mozcrt/mozglue.
+export:: EXTRA_MAKE_FLAGS := SHARED_LIBRARY= IMPORT_LIBRARY= SHARED_LIB_PDB=
 endif
 
 libs export clean distclean::
 	$(MAKE) -C $(DEPTH)/nsprpub $@ $(EXTRA_MAKE_FLAGS)
 
 libs::
 	$(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include/nspr libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR= $(EXTRA_MAKE_FLAGS)
 	$(INSTALL) $(DEPTH)/nsprpub/config/nspr-config $(DIST)/sdk/bin