Fix Mach-O static build. Bug 127186. r=cls, sr=scc, a=dbaron

gfx/src/mac/nsGfxFactoryMac.cpp

@@ -183,6 +183,6 @@ nsGfxMacModuleDtor(nsIModule *self)
   nsUnicodeMappingUtil::FreeSingleton();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR(nsGfxModule, components, nsGfxMacModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsGfxMacModule, components, nsGfxMacModuleDtor)
 
 

widget/src/mac/Makefile.in

@@ -96,6 +96,15 @@ XPIDLSRCS	+= \
 		nsIDragHelperService.idl \
 		$(NULL)
 
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a
+
+EXTRA_DSO_LDOPTS += \
+		$(MOZ_UNICHARUTIL_LIBS) \
+                $(TK_LIBS) \
+                $(MOZ_COMPONENT_LIBS) \
+                -lgkgfx \
+                $(NULL)
+
 GARBAGE		+= $(GFX_LCPPSRCS)
 
 include $(topsrcdir)/config/rules.mk
@@ -103,14 +112,6 @@ include $(topsrcdir)/config/rules.mk
 export:: $(addprefix $(topsrcdir)/gfx/src/mac/,$(GFX_LCPPSRCS))
 	$(INSTALL) $^ .
 
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_UNICHARUTIL_LIBS) \
-                $(DIST)/lib/libxpwidgets_s.a \
-                $(TK_LIBS) \
-                $(MOZ_COMPONENT_LIBS) \
-                -lgkgfx \
-                $(NULL)
-
 LOCAL_INCLUDES	= \
 	$(TK_CFLAGS) \
 	-I$(topsrcdir)/gfx/src/mac \

widget/src/mac/nsWidgetFactory.cpp

@@ -220,5 +220,5 @@ static const nsModuleComponentInfo components[] =
 #endif // IBMBIDI
 };
 
-NS_IMPL_NSGETMODULE(nsWidgetModule, components)
+NS_IMPL_NSGETMODULE(nsWidgetMacModule, components)
 

xpfe/bootstrap/Makefile.in

@@ -190,8 +190,12 @@ $(PROGRAM): $(SPLASH_XPM)
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-# don't let us build with "-dynamiclib"
-EXTRA_DSO_LDOPTS = -execute
+EXTRA_DSO_LDOPTS := $(subst -dynamiclib,-execute,$(EXTRA_DSO_LDOPTS))
+
+ifdef BUILD_STATIC_LIBS
+LDFLAGS	+= -framework QuickTime
+endif
+
 endif
 
 # This code removes the console from release builds