Bug 701683 - Port |Bug #698248 - Remove FORCE_USE_PIC| to SeaMonkey. r=Callek
authorEdmund Wong <ewong@pw-wspx.org>
Sat, 10 Dec 2011 23:54:28 +0800
changeset 9967 045ed5e786193f7edc5cbdc5cbe6faa32d059c02
parent 9966 75669e449485d980f1c9576577c9b516c17f0fbb
child 9968 e490369977e676f9288b27bec53b19e8acab6015
push id336
push userbugzilla@standard8.plus.com
push dateTue, 31 Jan 2012 22:15:45 +0000
treeherdercomm-beta@54945f5d278d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs701683, 698248
Bug 701683 - Port |Bug #698248 - Remove FORCE_USE_PIC| to SeaMonkey. r=Callek
suite/feeds/src/Makefile.in
suite/profile/Makefile.in
suite/profile/migration/src/Makefile.in
--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@@ -39,17 +39,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = suitefeeds
 LIBRARY_NAME = suitefeeds_s
 FORCE_STATIC_LIB = 1
-FORCE_USE_PIC = 1
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
 	$(NULL)
 
 EXTRA_COMPONENTS = \
 	SuiteFeeds.manifest \
--- a/suite/profile/Makefile.in
+++ b/suite/profile/Makefile.in
@@ -51,14 +51,11 @@ LIBRARY_NAME	= suiteprofile_s
 CPPSRCS 	= \
 		nsSuiteDirectoryProvider.cpp \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB=1
-# this is a static lib but gets built into libsuite.so later and therefore needs
-# to be compiled using -fPIC
-FORCE_USE_PIC=1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/suite/profile/migration/src/Makefile.in
+++ b/suite/profile/migration/src/Makefile.in
@@ -49,12 +49,10 @@ CPPSRCS = \
 		nsSuiteProfileMigratorUtils.cpp \
 		nsNetscapeProfileMigratorBase.cpp \
 		nsSeamonkeyProfileMigrator.cpp \
 		nsThunderbirdProfileMigrator.cpp \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
-# need to force PIC as the static lib gets linked into libsuite.so
-FORCE_USE_PIC=1
 
 include $(topsrcdir)/config/rules.mk