Bug 584474 part 6 - Remove duplicate libxpcomglue_s in link flags. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 25 Feb 2011 15:02:04 +0100
changeset 63469 5de65a480c6d2e87d24f5cbe8534149776ba74b1
parent 63468 22570be102af5ac1ee0aa3748a6a468f9701b7f9
child 63470 f59a24b5903b3f1e41dfa8af160e73dc7b3ff17c
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs584474
milestone2.0b12pre
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 584474 part 6 - Remove duplicate libxpcomglue_s in link flags. r=ted
netwerk/test/Makefile.in
storage/test/Makefile.in
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -86,17 +86,16 @@ endif
 
 CPP_UNIT_TESTS = \
 		 TestSTSParser.cpp \
 		 $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 LIBS		= $(EXTRA_DSO_LIBS) \
-		  $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		  $(XPCOM_LIBS) \
 		  $(NSPR_LIBS) \
 		  $(NULL)
 
 DEFINES += $(TK_CFLAGS)
 
 XPCSHELL_TESTS = unit
 ifdef MOZ_IPC
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -73,14 +73,13 @@ endif
 
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../src \
   $(NULL)
 
 LIBS = \
 	$(LIBS_DIR) \
-	$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(SQLITE_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk