Bug 321650 - "error in bsdiff makefile results in compile error of mbsdiff". Adds bsdiff makefiles to allmakefiles.sh (uses the --enable-update-packaging mozconfig option), adds RTL_FLAGS to HOST_CFLAGS globally, and uses HOST_EXTRA_LIBS instead of EXTRA_LIBS in the bsdiff makefile. r=bsmedberg.

allmakefiles.sh

@@ -1219,7 +1219,10 @@ MAKEFILES_libmar="
 "
 
 if test -n "$MOZ_UPDATE_PACKAGING"; then
-    MAKEFILES_update_packaging="tools/update-packaging/Makefile"
+    MAKEFILES_update_packaging="
+        tools/update-packaging/Makefile
+        other-licenses/bsdiff/Makefile
+    "
 fi
 
 if [ ! "$SYSTEM_PNG" ]; then

config/config.mk

@@ -600,6 +600,7 @@ endif # WINNT && !GNU_CC
 
 COMPILE_CFLAGS	= $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS)
 COMPILE_CXXFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS)  $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
+HOST_CFLAGS += $(RTL_FLAGS)
 
 #
 # Name of the binary code directories

other-licenses/bsdiff/Makefile.in

@@ -50,7 +50,7 @@ HOST_CSRCS = bsdiff.c
 HOST_LIBS += $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX)
 
 ifeq (WINNT,$(OS_ARCH))
-EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
+HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
 endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/src/updater