Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Backport of tjr's patch for bug 1314979
  • Loading branch information
gk-tpo committed Apr 5, 2017
1 parent 70fd058 commit b63cc0d
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
6 changes: 5 additions & 1 deletion build/moz.configure/toolchain.configure
Expand Up @@ -906,5 +906,9 @@ set_define('HAVE_VISIBILITY_ATTRIBUTE',
set_config('WRAP_SYSTEM_INCLUDES', wrap_system_includes)
set_config('VISIBILITY_FLAGS', visibility_flags)

include('windows.configure')
@depends(target, c_compiler)
def is_windows(target, compiler):
return target.kernel == 'WINNT' and compiler.type in ['msvc', 'clang-cl']

include('windows.configure', when=is_windows)
include('rust.configure')
6 changes: 4 additions & 2 deletions moz.configure
Expand Up @@ -278,11 +278,13 @@ system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell',
set_config('MOZ_SYSTEM_HUNSPELL', depends_if(system_hunspell)(lambda _: True))


@depends(target)
@depends(target, c_compiler)
@imports('os')
def makensis_progs(target):
def makensis_progs(target, compiler):
if target.kernel != 'WINNT':
return
elif target.kernel == 'WINNT' and compiler.type not in ['msvc', 'clang-cl']:
return

candidates = [
'makensis-3.0b3.exe',
Expand Down
12 changes: 11 additions & 1 deletion old-configure.in
Expand Up @@ -3384,7 +3384,17 @@ if test -n "$MOZ_ANGLE_RENDERER"; then
AC_MSG_RESULT([Windows SDK not found.])
fi
else
AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.])
if test "$target" != "$host"; then
case "$target" in
*-mingw*)
AC_MSG_RESULT([Windows SDK not needed for ANGLE in MinGW build.])
;;
*)
AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.])
esac
else
AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.])
fi
fi

if test -z "$MOZ_D3DCOMPILER_VISTA_DLL_PATH"; then
Expand Down

0 comments on commit b63cc0d

Please sign in to comment.