Force in-tree zlib to be built using -fPIC.

Re-order linking of mozilla-bin & viewer so that TK_LIBS, which bring in an implicit dependency upon the system zlib on Darwin, is linked in after the in-tree version of zlib.
Bug #194662 r=pavlov

modules/zlib/src/Makefile.in

@@ -41,6 +41,9 @@ CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
 
 EXPORTS		= $(MODULES_ZLIB_SRC_LEXPORTS)
 
+# This library is used by other shared libs in a static build
+FORCE_USE_PIC = 1
+
 include $(topsrcdir)/config/rules.mk
 
 

webshell/tests/viewer/Makefile.in

@@ -134,16 +134,13 @@ ifdef MOZ_PERF_METRICS
 XP_DIST_LIBS		+= -lmozutil_s
 endif
 
-XP_DIST_LIBS		+= \
+XP_LIBS			= \
+			$(MOZ_WIDGET_SUPPORT_LIBS) \
 			$(EXTRA_DSO_LIBS) \
+			$(XP_DIST_LIBS) \
 			$(MOZ_JS_LIBS) \
 			$(MOZ_UNICHARUTIL_LIBS) \
 			$(XPCOM_LIBS) \
-			$(NULL)
-
-XP_LIBS			= \
-			$(MOZ_WIDGET_SUPPORT_LIBS) \
-			$(XP_DIST_LIBS) \
 			$(NSPR_LIBS) \
 			$(NULL)
 
@@ -151,10 +148,11 @@ LIBS			= \
 			$(VIEWER_TK_LIBS) \
 			$(GTK_GLUE) \
 			$(XP_LIBS) \
-			$(TK_LIBS) \
 			$(PROFILER_LIBS) \
 			$(NULL)
 
+EXTRA_LIBS		= $(TK_LIBS)
+
 XLIB_LIBS		= unix/xlib/libviewer_xlib_s.a $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
 GTK_LIBS		= unix/gtk/libviewer_gtk_s.a -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
 
@@ -183,13 +181,11 @@ ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-config.mk
 
 EXTRA_DEPS     += $(STATIC_EXTRA_DEPS)
-EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
 ifneq ($(OS_ARCH),WINNT)
-EXTRA_LIBS     += -L$(DEPTH)/dist/lib/components
+LDFLAGS        += -L$(DEPTH)/dist/lib/components
 endif # !WINNT
-EXTRA_LIBS     += $(EXTRA_DSO_LIBS) $(STATIC_EXTRA_LIBS)
-XLIB_LIBS      += $(EXTRA_LIBS)
-GTK_LIBS       += $(EXTRA_LIBS)
+EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
+XP_DIST_LIBS   += $(STATIC_EXTRA_LIBS)
 DEFINES        += $(STATIC_DEFINES)
 CPPSRCS        += $(STATIC_CPPSRCS)
 
@@ -207,7 +203,7 @@ endif # BUILD_STATIC_LIBS
 ifeq ($(OS_ARCH),Darwin)
 LOCAL_INCLUDES		+= -I$(topsrcdir)/widget/src/mac
 ifdef BUILD_STATIC_LIBS
-LDFLAGS	+= -framework QuickTime $(TK_LIBS)
+EXTRA_LIBS		+= -framework QuickTime
 endif
 endif
 

xpfe/bootstrap/Makefile.in

@@ -309,7 +309,7 @@ ifeq ($(OS_ARCH),Darwin)
 EXTRA_DSO_LDOPTS := $(subst -dynamiclib -install_name @executable_path/\$@ -compatibility_version 1 -current_version 1,-execute,$(EXTRA_DSO_LDOPTS))
 
 ifdef BUILD_STATIC_LIBS
-LDFLAGS	+= -framework QuickTime $(TK_LIBS)
+LIBS	+= -framework QuickTime
 endif
 
 endif