diff options
| author | Daniel Neus <[email protected]> | 2016-08-16 15:17:00 +0200 |
|---|---|---|
| committer | Daniel Neus <[email protected]> | 2016-08-16 15:17:00 +0200 |
| commit | b5c0beb0c63ba7850de6c1be5f362e831e805490 (patch) | |
| tree | e86d401a24aee95f0c43f5164c48051b3c907aea | |
| parent | c2c77c3ec0bcbf5bdaffd4e89b36636789ceac84 (diff) | |
No PDB output for CLI and tests
Fixes GH #432 : Previously the Botan CLI PDB file has overwritten the Botan lib PDB file.
Furthermore the output filename of the lib is changed to botand in debug mode.
| -rwxr-xr-x | configure.py | 13 | ||||
| -rw-r--r-- | src/build-data/cc/msvc.txt | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/configure.py b/configure.py index e7e61cab1..2983b7506 100755 --- a/configure.py +++ b/configure.py @@ -1337,10 +1337,6 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'shared_flags': cc.gen_shared_flags(options), 'visibility_attribute': cc.gen_visibility_attribute(options), - # 'botan' or 'botan-1.11'. Used in Makefile and install script - # This can be made consistent over all platforms in the future - 'libname': 'botan' if options.os == 'windows' else 'botan-%d.%d' % (build_config.version_major, build_config.version_minor), - 'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options), 'cli_link_cmd': cc.binary_link_command_for(osinfo.basename, options), 'test_link_cmd': cc.binary_link_command_for(osinfo.basename, options), @@ -1405,6 +1401,15 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): vars['botan_pkgconfig'] = prefix_with_build_dir(os.path.join(build_config.build_dir, build_config.pkg_config_file())) + # 'botan' or 'botan-1.11'. Used in Makefile and install script + # This can be made consistent over all platforms in the future + vars['libname'] = 'botan-%d.%d' % (build_config.version_major, build_config.version_minor) + else: + if options.with_debug_info: + vars['libname'] = 'botand' + else: + vars['libname'] = 'botan' + vars["header_in"] = process_template('src/build-data/makefile/header.in', vars) if vars["makefile_style"] == "gmake": diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 8231c0429..ff4b4369b 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -48,7 +48,7 @@ default-debug -> "$(LINKER) /DLL /DEBUG" <binary_link_commands> default -> "$(LINKER)" -default-debug -> "$(LINKER) /DEBUG" +default-debug -> "$(LINKER)" </binary_link_commands> <mach_abi_linking> |