aboutsummaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2015-09-11 22:44:45 -0400
committerJack Lloyd <[email protected]>2015-09-11 22:44:45 -0400
commit72719f52640d2ac3ff00fce46a72082e5938d212 (patch)
tree51018f639724326c0e967eb7372a762ce0b89e53 /configure.py
parent8211fdc11fa3bbe692b50d42126f74d259a4a96a (diff)
Fix pbkdf, pk padding and ECDH registration for static linking.
With this change the tests pass when linked against a static library built in the normal (non-amalgamation) fashion. Remove the restriction in configure.py, and have circleci build the clang static build as a non-amalg.
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/configure.py b/configure.py
index 235c631ef..68ecf3a7a 100755
--- a/configure.py
+++ b/configure.py
@@ -1922,10 +1922,6 @@ def main(argv = None):
if options.via_amalgamation:
options.gen_amalgamation = True
- if not options.build_shared_lib and not options.via_amalgamation:
- 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.')