Bug 781868: Clear WRAP_LDFLAGS for the updater in Gonk, so it doesn't link against mozglue. r=khuey
authorMarshall Culpepper <marshall@mozilla.com>
Mon, 27 Aug 2012 12:23:09 -0300
changeset 105604 34c6bb1b619fc950f35974c5bff9023906e62d20
parent 105603 bbc3d49c19bac3decc806720ff05d9b641f33add
child 105605 304421291d6be0ef30e762e96b13b21c3bac4e5b
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewerskhuey
bugs781868
milestone17.0a1
Bug 781868: Clear WRAP_LDFLAGS for the updater in Gonk, so it doesn't link against mozglue. r=khuey
toolkit/mozapps/update/updater/Makefile.in
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@@ -71,16 +71,18 @@ HAVE_PROGRESSUI = 1
 CMMSRCS += progressui_osx.mm launchchild_osx.mm
 OS_LIBS += -framework Cocoa
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{
 HAVE_PROGRESSUI = 1
 STL_FLAGS =
 CPPSRCS += progressui_gonk.cpp
+# clear out all the --wrap flags and remove dependency on mozglue for Gonk
+WRAP_LDFLAGS :=
 endif #}
 
 ifndef HAVE_PROGRESSUI
 CPPSRCS += progressui_null.cpp
 endif
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG