Skip to content

Commit

Permalink
Lint fixes [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
randombit committed Nov 29, 2017
1 parent 77beb29 commit fb3dc25
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def src_info(self, typ):

def make_build_doc_commands(source_paths, build_paths, options):

if options.with_documentation == False:
if options.with_documentation is False:
return ""

def build_manual_command(src_dir, dst_dir):
Expand Down Expand Up @@ -1217,7 +1217,7 @@ def gen_flags():

return (' '.join(gen_flags())).strip()

def cc_lang_flags(self, options):
def cc_lang_flags(self):
return self.lang_flags

def cc_compile_flags(self, options):
Expand Down Expand Up @@ -1641,12 +1641,12 @@ def _write_footer(self, fd, library_link, cli_link, tests_link):
fd.write('option(ENABLED_LTO "If enabled link time optimization will be used" OFF)\n\n')

fd.write('set(COMPILER_FEATURES_RELEASE %s %s %s)\n'
% (self._cc.cc_lang_flags(self._options_release),
% (self._cc.cc_lang_flags(),
self._cc.cc_compile_flags(self._options_release),
self._cc.mach_abi_link_flags(self._options_release)))

fd.write('set(COMPILER_FEATURES_DEBUG %s %s %s)\n'
% (self._cc.cc_lang_flags(self._options_debug),
% (self._cc.cc_lang_flags(),
self._cc.cc_compile_flags(self._options_debug),
self._cc.mach_abi_link_flags(self._options_debug)))

Expand Down Expand Up @@ -2033,7 +2033,7 @@ def configure_command_line():
'cxx_abi_flags': cc.mach_abi_link_flags(options),
'linker': cc.linker_name or '$(CXX)',

'cc_lang_flags': cc.cc_lang_flags(options),
'cc_lang_flags': cc.cc_lang_flags(),
'cc_compile_flags': cc.cc_compile_flags(options),
'cc_warning_flags': cc.cc_warning_flags(options),

Expand Down Expand Up @@ -2964,7 +2964,7 @@ def deduce_compiler_type_from_cc_bin(cc_bin):
logging.info('Guessing target processor is a %s/%s (use --cpu to set)' % (
options.arch, options.cpu))

if options.with_sphinx is None and options.with_documentation == True:
if options.with_sphinx is None and options.with_documentation is True:
if have_program('sphinx-build'):
logging.info('Found sphinx-build (use --without-sphinx to disable)')
options.with_sphinx = True
Expand Down Expand Up @@ -3043,7 +3043,7 @@ def validate_options(options, info_os, info_cc, available_module_policies):
if options.build_fuzzers == 'klee' and options.os != 'llvm':
raise UserError('Building for KLEE requires targetting LLVM')

if options.with_documentation == False:
if options.with_documentation is False:
if options.with_doxygen:
raise UserError('Using --with-doxygen plus --without-documentation makes no sense')
if options.with_sphinx:
Expand Down

0 comments on commit fb3dc25

Please sign in to comment.