Bug 429178 - "ssltunnel fails to build in system-nspr / system-nss environments" [p=kaie@kuix.de (Kai Engert) r=luser/ted sr=bsmedberg]
authorKai Engert <kaie@kuix.de>
Wed, 04 Jun 2008 01:31:28 -0500
changeset 15239 c7765fd74badd0b8ce76f65c7d0075b8b41383c0
parent 15238 1a969abc855623a4cf7abe1a3288caedd3dc7e00
child 15240 8a37d1e56dd2246f6b4eb4f2102ed6e7b505ee05
push id71
push userreed@reedloden.com
push dateWed, 04 Jun 2008 06:31:20 +0000
treeherdermozilla-central@c7765fd74bad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluser, ted, bsmedberg
bugs429178
milestone1.9.1a1pre
Bug 429178 - "ssltunnel fails to build in system-nspr / system-nss environments" [p=kaie@kuix.de (Kai Engert) r=luser/ted sr=bsmedberg]
testing/mochitest/ssltunnel/Makefile.in
--- a/testing/mochitest/ssltunnel/Makefile.in
+++ b/testing/mochitest/ssltunnel/Makefile.in
@@ -50,14 +50,18 @@ CPPSRCS = ssltunnel.cpp
 # Despite not catching exceptions, we're using STL
 ENABLE_CXX_EXCEPTIONS=1
 
 REQUIRES = \
 	nspr \
 	nss \
 	$(NULL)
 
+# Use local includes because they are inserted before INCLUDES
+# so that Mozilla's nss.h is used, not glibc's
+LOCAL_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS)
+
 LIBS = \
 	$(NSPR_LIBS) \
 	$(NSS_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk