Bug 1024510 - Unbreak --with-system-nss build after bug 1022812. r=mshal
authorJan Beich <jbeich@tormail.org>
Mon, 16 Jun 2014 01:02:25 -0400
changeset 188822 d591d9ed638b51eed04e1719b6479df9fe1db150
parent 188821 8c3f99209da5af4fa2b0c722b7021263c942411f
child 188823 2ab8afeb4b2d3b95c5dacd35b687206eb047b6e4
push id44919
push userrjesup@wgate.com
push dateMon, 16 Jun 2014 05:02:56 +0000
treeherdermozilla-inbound@d591d9ed638b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1024510, 1022812
milestone33.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 1024510 - Unbreak --with-system-nss build after bug 1022812. r=mshal
media/mtransport/test/Makefile.in
--- a/media/mtransport/test/Makefile.in
+++ b/media/mtransport/test/Makefile.in
@@ -1,26 +1,33 @@
 # -*- Mode: makefile; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- #
 # 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/.
 
-# Statically linking NSS libssl ensures that we can debug NSS too
 LIBS = \
   $(XPCOM_LIBS) \
   $(NSPR_LIBS) \
-  $(DEPTH)/dist/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
-  $(DEPTH)/dist/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
-  $(DEPTH)/dist/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
   $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \
   $(DEPTH)/media/mtransport/third_party/nICEr/nicer_nicer/$(LIB_PREFIX)nicer.$(LIB_SUFFIX) \
   $(DEPTH)/media/mtransport/third_party/nrappkit/nrappkit_nrappkit/$(LIB_PREFIX)nrappkit.$(LIB_SUFFIX) \
   $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
   $(NULL)
 
+ifdef MOZ_NATIVE_NSS
+LIBS += $(NSS_LIBS)
+else
+# Statically linking NSS libssl ensures that we can debug NSS too
+LIBS += \
+  $(DEPTH)/dist/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
+  $(DEPTH)/dist/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
+  $(DEPTH)/dist/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
+  $(NULL)
+endif
+
 ifdef MOZ_SCTP
 LIBS += $(DEPTH)/netwerk/sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX)
 endif
 
 ifeq ($(OS_TARGET), Android)
 LIBS += \
   $(STLPORT_LDFLAGS) \
   $(STLPORT_LIBS) \