mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 678161 - Also install msvc*.dll when using new style jemalloc. r=khuey
This commit is contained in:
parent
cef69a140b
commit
cdbf66ae45
@ -60,15 +60,13 @@
|
||||
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
|
||||
#endif
|
||||
#ifdef XP_WIN32
|
||||
#ifdef MOZ_MEMORY
|
||||
#ifdef WIN32_OLD_STYLE_JEMALLOC
|
||||
@BINPATH@/mozcrt19.dll
|
||||
@BINPATH@/mozcpp19.dll
|
||||
#else
|
||||
#ifdef MOZ_MEMORY
|
||||
@BINPATH@/jemalloc.dll
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#if _MSC_VER == 1400
|
||||
@BINPATH@/Microsoft.VC80.CRT.manifest
|
||||
@BINPATH@/msvcm80.dll
|
||||
@ -83,6 +81,7 @@
|
||||
@BINPATH@/msvcp100.dll
|
||||
@BINPATH@/msvcr100.dll
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -1272,13 +1272,14 @@ xpicleanup@BIN_SUFFIX@
|
||||
components/nsPostUpdateWin.js
|
||||
js3250.dll
|
||||
plugins/npnul32.dll
|
||||
#ifdef MOZ_MEMORY
|
||||
#ifdef WIN32_OLD_STYLE_JEMALLOC
|
||||
Microsoft.VC80.CRT.manifest
|
||||
msvcm80.dll
|
||||
msvcp80.dll
|
||||
msvcr80.dll
|
||||
#else
|
||||
mozcrt19.dll
|
||||
mozcpp19.dll
|
||||
#endif
|
||||
#endif
|
||||
@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
|
||||
|
@ -64,7 +64,7 @@ endif # ENABLE_TESTS
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifndef MOZ_MEMORY
|
||||
ifndef WIN32_OLD_STYLE_JEMALLOC
|
||||
ifdef WIN32_REDIST_DIR
|
||||
ifndef MOZ_DEBUG
|
||||
|
||||
|
@ -78,6 +78,10 @@ DEFINES += -DJAREXT=$(JAREXT)
|
||||
include $(topsrcdir)/ipc/app/defs.mk
|
||||
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
|
||||
|
||||
ifdef WIN32_OLD_STYLE_JEMALLOC
|
||||
DEFINES += -DWIN32_OLD_STYLE_JEMALLOC=1
|
||||
endif
|
||||
|
||||
ifdef MOZ_PKG_MANIFEST_P
|
||||
MOZ_PKG_MANIFEST = package-manifest
|
||||
endif
|
||||
|
@ -58,7 +58,13 @@
|
||||
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
|
||||
#endif
|
||||
#ifdef XP_WIN32
|
||||
#ifndef MOZ_MEMORY
|
||||
#ifdef WIN32_OLD_STYLE_JEMALLOC
|
||||
@BINPATH@/mozcrt19.dll
|
||||
@BINPATH@/mozcpp19.dll
|
||||
#else
|
||||
#ifdef MOZ_MEMORY
|
||||
@BINPATH@/jemalloc.dll
|
||||
#endif
|
||||
#if _MSC_VER == 1400
|
||||
@BINPATH@/Microsoft.VC80.CRT.manifest
|
||||
@BINPATH@/msvcm80.dll
|
||||
@ -73,11 +79,10 @@
|
||||
@BINPATH@/msvcp100.dll
|
||||
@BINPATH@/msvcr100.dll
|
||||
#endif
|
||||
#else
|
||||
@BINPATH@/mozcrt19.dll
|
||||
@BINPATH@/mozcpp19.dll
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef ANDROID
|
||||
@BINPATH@/AndroidManifest.xml
|
||||
@BINPATH@/resources.arsc
|
||||
|
@ -2,3 +2,14 @@ README.txt
|
||||
#if MOZ_UPDATE_CHANNEL != beta
|
||||
extensions/feedback@mobile.mozilla.org.xpi
|
||||
#endif
|
||||
#ifdef XP_WIN
|
||||
#ifdef WIN32_OLD_STYLE_JEMALLOC
|
||||
Microsoft.VC80.CRT.manifest
|
||||
msvcm80.dll
|
||||
msvcp80.dll
|
||||
msvcr80.dll
|
||||
#else
|
||||
mozcrt19.dll
|
||||
mozcpp19.dll
|
||||
#endif
|
||||
#endif
|
||||
|
@ -90,8 +90,25 @@ JSSHELL_BINS = \
|
||||
ifndef MOZ_NATIVE_NSPR
|
||||
JSSHELL_BINS += $(DIST)/bin/$(LIB_PREFIX)nspr4$(DLL_SUFFIX)
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifdef WIN32_OLD_STYLE_JEMALLOC
|
||||
JSSHELL_BINS += $(DIST)/bin/mozcrt19$(DLL_SUFFIX)
|
||||
else
|
||||
ifdef MOZ_MEMORY
|
||||
JSSHELL_BINS += $(DIST)/bin/jemalloc$(DLL_SUFFIX)
|
||||
endif
|
||||
ifeq ($(_MSC_VER),1400)
|
||||
JSSHELL_BINS += $(DIST)/bin/Microsoft.VC80.CRT.manifest
|
||||
JSSHELL_BINS += $(DIST)/bin/msvcr80.dll
|
||||
endif
|
||||
ifeq ($(_MSC_VER),1500)
|
||||
JSSHELL_BINS += $(DIST)/bin/Microsoft.VC90.CRT.manifest
|
||||
JSSHELL_BINS += $(DIST)/bin/msvcr90.dll
|
||||
endif
|
||||
ifeq ($(_MSC_VER),1500)
|
||||
JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
|
||||
endif
|
||||
endif
|
||||
else
|
||||
JSSHELL_BINS += \
|
||||
$(DIST)/bin/$(LIB_PREFIX)plds4$(DLL_SUFFIX) \
|
||||
$(DIST)/bin/$(LIB_PREFIX)plc4$(DLL_SUFFIX) \
|
||||
|
Loading…
Reference in New Issue
Block a user