Commit cb2b9afe authored by Ted Mielczarek's avatar Ted Mielczarek
Browse files

bug 1384557 - fix flake8 lint errors 

MozReview-Commit-ID: 8dgZdOkAZ56

--HG--
extra : rebase_source : 6d4f937190c7312b3482d994ada31fa6ff5d2fac
parent 605e92f1

build/moz.configure/toolchain.configure

+2 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,7 @@ set_define('HAVE_VISIBILITY_ATTRIBUTE', 
set_config('WRAP_SYSTEM_INCLUDES', wrap_system_includes)

set_config('VISIBILITY_FLAGS', visibility_flags)





@depends(c_compiler, using_sccache)

def depend_cflags(info, using_sccache):

    if info.type not in ('clang-cl', 'msvc'):
@@ -1220,6 +1221,7 @@ def depend_cflags(info, using_sccache): 
        # by parsing MSVC's -showIncludes output.

        return '-deps$(MDDEPDIR)/$(@F).pp'





set_config('_DEPEND_CFLAGS', depend_cflags)

build/moz.configure/windows.configure

+3 −0
Original line number Diff line number Diff line
@@ -448,12 +448,14 @@ set_config('PATH', alter_path) 


check_prog('MAKECAB', ('makecab.exe',))





@depends(c_compiler, using_sccache)

def need_showincludes_prefix(info, using_sccache):

    # sccache does its own -showIncludes prefix checking.

    if info.type in ('clang-cl', 'msvc') and not using_sccache:

        return True





@depends(c_compiler, when=need_showincludes_prefix)

@imports(_from='re', _import='compile', _as='re_compile')

def msvc_showincludes_prefix(c_compiler):
@@ -468,4 +470,5 @@ def msvc_showincludes_prefix(c_compiler): 
    # We should have found the prefix and returned earlier

    die('Cannot find cl -showIncludes prefix.')





set_config('CL_INCLUDES_PREFIX', msvc_showincludes_prefix)