diff options
author | Jack Lloyd <[email protected]> | 2019-10-10 19:34:34 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2019-10-10 19:34:34 -0400 |
commit | d287c7567b5f65c9d21957d23bd324dcc4649b89 (patch) | |
tree | 5d0be099262d628ef095e5f80ed8622020a194bc /configure.py | |
parent | 4add9778f68f7c5832f61124870c1fdbb09c4997 (diff) | |
parent | 34f6e5266b3713965d8a2bdbada5fae18d3833f5 (diff) |
Merge GH #2140 Avoid make install trying to build unwanted targets
Diffstat (limited to 'configure.py')
-rwxr-xr-x | configure.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.py b/configure.py index e1ae0c78d..57af22c1e 100755 --- a/configure.py +++ b/configure.py @@ -1964,6 +1964,13 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, yield 'bogo_shim' yield 'docs' + def install_targets(options): + yield 'libs' + if 'cli' in options.build_targets: + yield 'cli' + if options.with_documentation: + yield 'docs' + def absolute_install_dir(p): if os.path.isabs(p): return p @@ -1986,6 +1993,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, 'macos_so_current_ver': '%s.%s.%s' % (Version.packed(), Version.so_rev(), Version.patch()), 'all_targets': ' '.join(all_targets(options)), + 'install_targets': ' '.join(install_targets(options)), 'base_dir': source_paths.base_dir, 'src_dir': source_paths.src_dir, @@ -1995,6 +2003,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, 'cli_exe_name': osinfo.cli_exe_name + program_suffix, 'cli_exe': join_with_build_dir(osinfo.cli_exe_name + program_suffix), + 'build_cli_exe': bool('cli' in options.build_targets), 'test_exe': join_with_build_dir('botan-test' + program_suffix), 'lib_prefix': osinfo.lib_prefix, |