aboutsummaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorSimon Warta <[email protected]>2017-03-08 00:31:37 +0100
committerSimon Warta <[email protected]>2017-03-08 23:33:34 +0100
commit66ed1927a0cf3a642eb601ab29bd9725f024766c (patch)
treeaac1548cf3960bb6a0b767210229164e1e0cf462 /configure.py
parente55c523989204c672de8e9a55fd422eb2576a4f6 (diff)
pylint: break long lines
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py21
1 files changed, 15 insertions, 6 deletions
diff --git a/configure.py b/configure.py
index 3afa4cde1..6aa02b580 100755
--- a/configure.py
+++ b/configure.py
@@ -388,7 +388,8 @@ def process_command_line(args): # pylint: disable=too-many-locals
dest='with_valgrind', action='store_true', default=False)
build_group.add_option('--with-bakefile', action='store_true',
- default=False, help='Generate bakefile which can be used to create Visual Studio or Xcode project files')
+ default=False,
+ help='Generate bakefile which can be used to create Visual Studio or Xcode project files')
build_group.add_option('--unsafe-fuzzer-mode', action='store_true', default=False,
help='disable essential checks for testing')
@@ -1439,8 +1440,11 @@ def gen_makefile_lists(var, build_config, options, modules, cc, arch, osinfo):
"""
includes = cc.add_include_dir_option + build_config.include_dir
- includes += (' ' + cc.add_include_dir_option + build_config.external_include_dir) if build_config.external_headers else ''
- includes += (' ' + cc.add_include_dir_option + options.with_external_includedir) if options.with_external_includedir else ''
+ if build_config.external_headers:
+ includes += ' ' + cc.add_include_dir_option + build_config.external_include_dir
+ if options.with_external_includedir:
+ includes += ' ' + cc.add_include_dir_option + options.with_external_includedir
+
for (obj_file, src) in zip(objectfile_list(sources, obj_dir), sources):
yield '%s: %s\n\t$(CXX)%s $(%s_FLAGS) %s %s %s %s$@\n' % (
obj_file, src,
@@ -1615,7 +1619,10 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
'cli_link_cmd': cc.binary_link_command_for(osinfo.basename, options) + external_link_cmd(),
'test_link_cmd': cc.binary_link_command_for(osinfo.basename, options) + external_link_cmd(),
- 'link_to': ' '.join([cc.add_lib_option + lib for lib in link_to()] + [cc.add_framework_option + fw for fw in link_to_frameworks()]),
+ 'link_to': ' '.join(
+ [cc.add_lib_option + lib for lib in link_to()] +
+ [cc.add_framework_option + fw for fw in link_to_frameworks()]
+ ),
'module_defines': make_cpp_macros(sorted(flatten([m.defines() for m in modules]))),
@@ -1667,8 +1674,10 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
if options.os == 'darwin' and options.build_shared_lib:
# In order that these executables work from the build directory,
# we need to change the install names
- vars['cli_post_link_cmd'] = 'install_name_tool -change "$(INSTALLED_LIB_DIR)/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(CLI)'
- vars['test_post_link_cmd'] = 'install_name_tool -change "$(INSTALLED_LIB_DIR)/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(TEST)'
+ vars['cli_post_link_cmd'] = \
+ 'install_name_tool -change "$(INSTALLED_LIB_DIR)/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(CLI)'
+ vars['test_post_link_cmd'] = \
+ 'install_name_tool -change "$(INSTALLED_LIB_DIR)/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(TEST)'
else:
vars['cli_post_link_cmd'] = ''
vars['test_post_link_cmd'] = ''