Bug 650699 - Sort out MSVC DLLs packaging in Debug builds; (Av1) In debug builds, don't warn nor package.

r=ted.mielczarek.
This commit is contained in:
Serge Gautherie 2011-04-22 19:33:36 +02:00
parent 5fa8e9094e
commit e07a78dad0
2 changed files with 3 additions and 1 deletions

View File

@ -64,6 +64,7 @@ include $(topsrcdir)/config/rules.mk
ifndef MOZ_MEMORY
ifdef WIN32_REDIST_DIR
ifndef MOZ_DEBUG
ifeq (1400,$(_MSC_VER))
REDIST_FILES = \
@ -96,5 +97,6 @@ libs::
install --preserve-timestamps $(foreach f,$(REDIST_FILES),"$(WIN32_REDIST_DIR)"/$(f)) $(FINAL_TARGET)
endif
endif # ! MOZ_DEBUG
endif # WIN32_REDIST_DIR
endif # ! MOZ_MEMORY

View File

@ -7256,7 +7256,7 @@ fi
if test -z "$MOZ_MEMORY"; then
case "${target}" in
*-mingw*)
if test -z "$WIN32_REDIST_DIR"; then
if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.])
fi
;;