Bug 605406 part 2 - Don't put libfreetype twice on the link command line. r=khuey,a=blassey
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 07 Nov 2010 09:20:51 +0100
changeset 57046 3671421f858c56d1d6d4ff29fe8c5c6d6f9aab10
parent 57045 c2c173d7091c69f421a07f843b125888ce464ad6
child 57047 129428f0d81ee998756ad6d833788403c86497b8
push id16767
push usermh@glandium.org
push dateSun, 07 Nov 2010 08:25:16 +0000
treeherdermozilla-central@4f11a96707f7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, blassey
bugs605406
milestone2.0b8pre
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 605406 part 2 - Don't put libfreetype twice on the link command line. r=khuey,a=blassey
toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -216,18 +216,20 @@ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
 endif
 
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
 EXTRA_DSO_LDOPTS += $(FT2_LIBS) $(MOZ_PANGO_LIBS)
 endif
 
 ifdef MOZ_TREE_FREETYPE
+ifndef MOZ_TREE_CAIRO
 EXTRA_DSO_LDOPTS += $(FT2_LIBS)
 endif
+endif
 
 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
 EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
 endif
 
 ifdef MOZ_ENABLE_LIBPROXY
 EXTRA_DSO_LDOPTS += $(MOZ_LIBPROXY_LIBS)
 endif