From 7b86e059f2ded57691433046165f420c713bfabf Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 19 Jun 2014 09:06:14 +0900 Subject: [PATCH] Bug 1027040 - Keep -L flags from MOZ_GTK*_LIBS when building gtk stub libraries. r=mshal --- widget/gtk/mozgtk/gtk2/Makefile.in | 2 +- widget/gtk/mozgtk/gtk3/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/widget/gtk/mozgtk/gtk2/Makefile.in b/widget/gtk/mozgtk/gtk2/Makefile.in index 68c2aab1cb8e..9ccbd52d8476 100644 --- a/widget/gtk/mozgtk/gtk2/Makefile.in +++ b/widget/gtk/mozgtk/gtk2/Makefile.in @@ -16,4 +16,4 @@ else no_as_needed = -Wl,--no-as-needed $1 -Wl,--as-needed endif -EXTRA_DSO_LDOPTS += $(call no_as_needed,-lgtk-x11-2.0 -lgdk-x11-2.0) +EXTRA_DSO_LDOPTS += $(filter -L%,$(MOZ_GTK2_LIBS)) $(call no_as_needed,-lgtk-x11-2.0 -lgdk-x11-2.0) diff --git a/widget/gtk/mozgtk/gtk3/Makefile.in b/widget/gtk/mozgtk/gtk3/Makefile.in index fb9a9c379b47..77eab2d06659 100644 --- a/widget/gtk/mozgtk/gtk3/Makefile.in +++ b/widget/gtk/mozgtk/gtk3/Makefile.in @@ -14,4 +14,4 @@ else no_as_needed = -Wl,--no-as-needed $1 -Wl,--as-needed endif -EXTRA_DSO_LDOPTS += $(call no_as_needed,-lgtk-3 -lgdk-3) +EXTRA_DSO_LDOPTS += $(filter -L%,$(MOZ_GTK3_LIBS)) $(call no_as_needed,-lgtk-3 -lgdk-3)