diff --git a/mozilla/modules/libbz2/src/Makefile.in b/mozilla/modules/libbz2/src/Makefile.in index 5c74ecdc149..094bb02cbdb 100644 --- a/mozilla/modules/libbz2/src/Makefile.in +++ b/mozilla/modules/libbz2/src/Makefile.in @@ -46,6 +46,9 @@ include $(DEPTH)/config/autoconf.mk MODULE = libbz2 LIBRARY_NAME = bz2 FORCE_STATIC_LIB= 1 +ifeq ($(OS_ARCH),WINNT) +USE_STATIC_LIBS = 1 +endif # This is defined by the bzip2-1.0.3 Makefile. It appears to be used to # configure GLIBC to support large files. This isn't something we care about diff --git a/mozilla/modules/libmar/src/Makefile.in b/mozilla/modules/libmar/src/Makefile.in index 6e417476b76..1594b6ad5aa 100644 --- a/mozilla/modules/libmar/src/Makefile.in +++ b/mozilla/modules/libmar/src/Makefile.in @@ -47,6 +47,9 @@ MODULE = libmar LIBRARY_NAME = mar HOST_LIBRARY_NAME = hostmar FORCE_STATIC_LIB = 1 +ifeq ($(OS_ARCH),WINNT) +USE_STATIC_LIBS = 1 +endif # This makefile just builds support for reading archives. diff --git a/mozilla/modules/libmar/tool/Makefile.in b/mozilla/modules/libmar/tool/Makefile.in index ef90b81deff..7fd5be1fdfa 100644 --- a/mozilla/modules/libmar/tool/Makefile.in +++ b/mozilla/modules/libmar/tool/Makefile.in @@ -44,6 +44,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = mar +ifeq ($(OS_ARCH),WINNT) +USE_STATIC_LIBS = 1 +endif # The mar executable is output into dist/host/bin since it is something that # would only be used by our build system and should not itself be included in a diff --git a/mozilla/toolkit/mozapps/update/src/updater/Makefile.in b/mozilla/toolkit/mozapps/update/src/updater/Makefile.in index 6a1f37390c4..40d130b2dca 100644 --- a/mozilla/toolkit/mozapps/update/src/updater/Makefile.in +++ b/mozilla/toolkit/mozapps/update/src/updater/Makefile.in @@ -60,6 +60,7 @@ LIBS += \ $(NULL) ifeq ($(OS_ARCH),WINNT) +USE_STATIC_LIBS = 1 HAVE_PROGRESSUI = 1 RCINCLUDE = updater.rc CPPSRCS += progressui_win.cpp