diff options
| -rwxr-xr-x | configure.py | 13 | ||||
| -rw-r--r-- | src/build-data/os/cygwin.txt | 2 | ||||
| -rw-r--r-- | src/build-data/os/mingw.txt | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/configure.py b/configure.py index 32b8a7d3a..235c631ef 100755 --- a/configure.py +++ b/configure.py @@ -971,14 +971,14 @@ class OsInfo(object): 'bin_dir': 'bin', 'lib_dir': 'lib', 'doc_dir': 'share/doc', - 'build_shared': 'yes', + 'building_shared_supported': 'yes', 'install_cmd_data': 'install -m 644', 'install_cmd_exec': 'install -m 755' }) self.ar_needs_ranlib = bool(self.ar_needs_ranlib) - self.build_shared = (True if self.build_shared == 'yes' else False) + self.building_shared_supported = (True if self.building_shared_supported == 'yes' else False) def ranlib_command(self): return ('ranlib' if self.ar_needs_ranlib else 'true') @@ -1926,17 +1926,16 @@ def main(argv = None): raise Exception('Static build is only supported using amalgamation. ' 'Add --via-amalgamation.') + if options.build_shared_lib and not osinfo.building_shared_supported: + raise Exception('Botan does not support building as shared library on the target os. ' + 'Build static using --disable-shared.') + loaded_mods = choose_modules_to_use(modules, arch, cc, options) for m in loaded_mods: if modules[m].load_on == 'vendor': logging.info('Enabling use of external dependency %s' % (m)) - if not osinfo.build_shared: - if options.build_shared_lib: - logging.info('Disabling shared lib on %s' % (options.os)) - options.build_shared_lib = False - using_mods = [modules[m] for m in loaded_mods] build_config = BuildConfigurationInformation(options, using_mods) diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt index be67e2607..7788cd3ca 100644 --- a/src/build-data/os/cygwin.txt +++ b/src/build-data/os/cygwin.txt @@ -5,7 +5,7 @@ program_suffix .exe # Cygwin supports shared libs fine, but there are problems with making a Botan # shared library when libraries it depends on are static-only (such as libz). # So until I can figure out a work-around, it's disabled. -build_shared no +building_shared_supported no install_root c:\Botan doc_dir docs diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt index a2ba363f2..5c72099e0 100644 --- a/src/build-data/os/mingw.txt +++ b/src/build-data/os/mingw.txt @@ -4,11 +4,7 @@ program_suffix .exe obj_suffix o static_suffix a -soname_pattern_base "libbotan-{version_major}.{version_minor}.dll" -soname_pattern_abi "libbotan-{version_major}.{version_minor}.dll.{abi_rev}" -soname_pattern_patch "libbotan-{version_major}.{version_minor}.dll.{abi_rev}.{version_patch}" - -build_shared no +building_shared_supported no ar_command "ar crs" ar_needs_ranlib yes |