зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1619867 - Look for .exe-suffixed midl and rc from configure. r=dmajor
With this and all the previous changes, the necessary mozconfig for local cross-builds only contains DIA_SDK_PATH, WINDOWSSDKDIR and --target. Differential Revision: https://phabricator.services.mozilla.com/D65295 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
5da778f6e4
Коммит
5e3d7e3257
|
@ -28,8 +28,6 @@ if [ -d "${CLANG_CL_EXE_DIR}" ]; then
|
|||
chmod +x "${CLANG_CL_EXE_DIR}/clang-cl.exe"
|
||||
fi
|
||||
export WINE=${MOZ_FETCHES_DIR}/wine/bin/wine64
|
||||
export RC=rc.exe
|
||||
export MIDL=midl.exe
|
||||
mk_add_options "export PATH=${TOOLTOOL_DIR}/vs2017_15.8.4/VC/bin/Hostx64/x64:${MOZ_FETCHES_DIR}/nsis-3.01:${CLANG_CL_EXE_DIR}:${PATH}"
|
||||
|
||||
unset VC_PATH
|
||||
|
|
|
@ -2426,7 +2426,7 @@ def rc_names(c_compiler, toolchain_prefix):
|
|||
if c_compiler.type in ('gcc', 'clang'):
|
||||
return tuple('%s%s' % (p, 'windres')
|
||||
for p in ('',) + (toolchain_prefix or ()))
|
||||
return ('rc',)
|
||||
return ('rc.exe',)
|
||||
|
||||
|
||||
check_prog('RC', rc_names, paths=sdk_bin_path, when=target_is_windows)
|
||||
|
|
|
@ -1138,7 +1138,7 @@ def midl_names(c_compiler, toolchain_prefix):
|
|||
widl = prefixed + widl
|
||||
return widl
|
||||
|
||||
return ('midl',)
|
||||
return ('midl.exe',)
|
||||
|
||||
@depends(target, '--enable-compile-environment')
|
||||
def check_for_midl(target, compile_environment):
|
||||
|
|
Загрузка…
Ссылка в новой задаче