diff options
| author | Simon Warta <[email protected]> | 2015-09-09 23:48:08 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-09-09 23:48:08 +0200 |
| commit | a96a7b79662f5045f0810dfa5d5cb4ebbd04ae42 (patch) | |
| tree | 40d767a7e14f474023242515f8e6c3006eddcee9 /src | |
| parent | 37ebfc0c5b3ffe6ead52678425dee62fd7993ec7 (diff) | |
| parent | 71092b319e289920db34c0b5839867b3aa29de58 (diff) | |
Merge pull request #275 from webmaster128/avoid-static-nonamalgamation
Prevent users from building static non-amalgamations on MinGW and Cygwin
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/os/cygwin.txt | 2 | ||||
| -rw-r--r-- | src/build-data/os/mingw.txt | 6 |
2 files changed, 2 insertions, 6 deletions
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 |