Commit 9f977f7d authored by Georg Koppen's avatar Georg Koppen
Browse files

Backport of tjr's patch for bug 1314979

parent f3b84e2b

build/moz.configure/toolchain.configure

+5 −1
Original line number Diff line number Diff line
@@ -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')

moz.configure

+4 −2
Original line number Diff line number Diff line
@@ -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.01.exe',

old-configure.in

+11 −1
Original line number Diff line number Diff line
@@ -3384,7 +3384,17 @@ if test -n "$MOZ_ANGLE_RENDERER"; then 
      AC_MSG_RESULT([Windows SDK not found.])

    fi

  else

    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