[mq]: fix-ldap draft
authorJoshua Cranmer <Pidgeot18@gmail.com>
Tue, 10 Sep 2013 22:35:02 -0500
changeset 19288 b3e75a2b2f03b29cc0fa2dff834105202bf22062
parent 19285 52cc604d695c6567e0c71ed51b8835222cafd82a
child 19289 7cd83be887a41738e262f99b5c25675a7ef59be3
push id965
push userPidgeot18@gmail.com
push dateWed, 11 Sep 2013 04:00:39 +0000
treeherdertry-comm-central@7cd83be887a4 [default view] [failures only]
[mq]: fix-ldap
ldap/Makefile.in
--- a/ldap/Makefile.in
+++ b/ldap/Makefile.in
@@ -1,7 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-libs export clean distclean::
+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=
+else
+# Work around libVersionPoint conflict between all three libraries.
+# See bug #838566.
+EXTRA_MAKE_FLAGS :=
+endif
+
+libs clean distclean::
 	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk $@
 
+export::
+	$(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk $@ $(EXTRA_MAKE_FLAGS)
+