mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1457523: Add msdia140.dll to the package on Windows ASan CI builds. r=ted

This commit is contained in:
David Major 2018-05-03 15:53:53 -04:00
Родитель 84a800ebe9
Коммит 1e59fef758
7 изменённых файлов: 31 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/installer/Makefile.in
Просмотреть файл

@ -148,6 +148,9 @@ endif
ifdef MOZ_CLANG_RT_ASAN_LIB_PATH
DEFINES += -DMOZ_CLANG_RT_ASAN_LIB=$(notdir $(MOZ_CLANG_RT_ASAN_LIB_PATH))
endif
ifdef WIN_DIA_SDK_BIN_DIR
DEFINES += -DWIN_DIA_SDK_BIN_DIR=1
endif
# Builds using the hybrid FasterMake/RecursiveMake backend will
# fail to produce a langpack. See bug 1255096.

4
browser/installer/package-manifest.in
Просмотреть файл

@ -588,6 +588,10 @@ bin/libfreebl_32int64_3.so
#ifdef LLVM_SYMBOLIZER
@BINPATH@/@LLVM_SYMBOLIZER@
; On Windows, llvm-symbolizer depends on the MS DIA library.
#ifdef WIN_DIA_SDK_BIN_DIR
@BINPATH@/msdia140.dll
#endif
#endif
#ifdef MOZ_CLANG_RT_ASAN_LIB

6
build/win32/moz.build
Просмотреть файл

@ -26,3 +26,9 @@ if CONFIG['WIN_UCRT_REDIST_DIR'] and CONFIG['COMPILE_ENVIRONMENT']:
FINAL_TARGET_FILES += [
'%%%s/%s' % (CONFIG['WIN_UCRT_REDIST_DIR'], f)
]
if CONFIG['LLVM_SYMBOLIZER'] and CONFIG['WIN_DIA_SDK_BIN_DIR']:
# On Windows, llvm-symbolizer depends on the MS DIA library.
FINAL_TARGET_FILES += [
'%%%s/msdia140.dll' % CONFIG['WIN_DIA_SDK_BIN_DIR']
]

4
build/win32/mozconfig.vs2017
Просмотреть файл

@ -9,8 +9,9 @@ if [ -d "${VSPATH}" ]; then
export WINDOWSSDKDIR="${VSWINPATH}/SDK"
export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC141.CRT"
export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin"
export PATH="${VSPATH}/VC/bin/Hostx86/x86:${VSPATH}/VC/bin/Hostx64/x86:${VSPATH}/VC/bin/Hostx64/x64:${VSPATH}/SDK/bin/10.0.15063.0/x64:${VSPATH}/DIA SDK/bin:${PATH}"
export PATH="${VSPATH}/VC/bin/Hostx86/x86:${VSPATH}/VC/bin/Hostx64/x86:${VSPATH}/VC/bin/Hostx64/x64:${VSPATH}/SDK/bin/10.0.15063.0/x64:${WIN_DIA_SDK_BIN_DIR}:${PATH}"
export PATH="${VSPATH}/VC/redist/x86/Microsoft.VC141.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x86:${PATH}"
export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.15063.0/ucrt:${VSPATH}/SDK/Include/10.0.15063.0/shared:${VSPATH}/SDK/Include/10.0.15063.0/um:${VSPATH}/SDK/Include/10.0.15063.0/winrt:${VSPATH}/DIA SDK/include"
@ -25,6 +26,7 @@ fi
mk_export_correct_style WINDOWSSDKDIR
mk_export_correct_style WIN32_REDIST_DIR
mk_export_correct_style WIN_UCRT_REDIST_DIR
mk_export_correct_style WIN_DIA_SDK_BIN_DIR
mk_export_correct_style PATH
mk_export_correct_style INCLUDE
mk_export_correct_style LIB

4
build/win64/mozconfig.vs2017
Просмотреть файл

@ -9,8 +9,9 @@ if [ -d "${VSPATH}" ]; then
export WINDOWSSDKDIR="${VSWINPATH}/SDK"
export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC141.CRT
export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
export PATH="${VSPATH}/VC/bin/Hostx64/x64:${VSPATH}/SDK/bin/10.0.15063.0/x64:${VSPATH}/VC/redist/x64/Microsoft.VC141.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIA SDK/bin/amd64:${PATH}"
export PATH="${VSPATH}/VC/bin/Hostx64/x64:${VSPATH}/SDK/bin/10.0.15063.0/x64:${VSPATH}/VC/redist/x64/Microsoft.VC141.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${WIN_DIA_SDK_BIN_DIR}:${PATH}"
export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.15063.0/ucrt:${VSPATH}/SDK/Include/10.0.15063.0/shared:${VSPATH}/SDK/Include/10.0.15063.0/um:${VSPATH}/SDK/Include/10.0.15063.0/winrt:${VSPATH}/DIA SDK/include"
export LIB="${VSPATH}/VC/lib/x64:${VSPATH}/VC/atlmfc/lib/x64:${VSPATH}/SDK/Lib/10.0.15063.0/ucrt/x64:${VSPATH}/SDK/Lib/10.0.15063.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
@ -21,6 +22,7 @@ fi
mk_export_correct_style WINDOWSSDKDIR
mk_export_correct_style WIN32_REDIST_DIR
mk_export_correct_style WIN_UCRT_REDIST_DIR
mk_export_correct_style WIN_DIA_SDK_BIN_DIR
mk_export_correct_style PATH
mk_export_correct_style INCLUDE
mk_export_correct_style LIB

8
old-configure.in
Просмотреть файл

@ -229,6 +229,13 @@ case "$target" in
WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && pwd -W`
fi
if test -n "$WIN_DIA_SDK_BIN_DIR"; then
if test ! -d "$WIN_DIA_SDK_BIN_DIR"; then
AC_MSG_ERROR([Invalid Windows DIA SDK directory: ${WIN_DIA_SDK_BIN_DIR}])
fi
WIN_DIA_SDK_BIN_DIR=`cd "$WIN_DIA_SDK_BIN_DIR" && pwd -W`
fi
AC_SUBST(MSVC_HAS_DIA_SDK)
AC_SUBST(MSVC_C_RUNTIME_DLL)
AC_SUBST(MSVC_CXX_RUNTIME_DLL)
@ -4407,6 +4414,7 @@ fi
dnl win32 options
AC_SUBST(WIN32_REDIST_DIR)
AC_SUBST(WIN_UCRT_REDIST_DIR)
AC_SUBST(WIN_DIA_SDK_BIN_DIR)
dnl ========================================================
dnl ICU Support

4
toolkit/mozapps/installer/upload-files.mk
Просмотреть файл

@ -78,6 +78,10 @@ endif
ifdef LLVM_SYMBOLIZER
JSSHELL_BINS += $(notdir $(LLVM_SYMBOLIZER))
# On Windows, llvm-symbolizer depends on the MS DIA library.
ifdef WIN_DIA_SDK_BIN_DIR
JSSHELL_BINS += msdia140.dll
endif
endif
ifdef MOZ_CLANG_RT_ASAN_LIB_PATH
JSSHELL_BINS += $(notdir $(MOZ_CLANG_RT_ASAN_LIB_PATH))