aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Warta <[email protected]>2015-07-19 13:52:55 +0200
committerSimon Warta <[email protected]>2015-07-19 13:52:55 +0200
commit3addb45a8e900dc4710a933278db7eb75716a8fd (patch)
tree0fba5795fab3b5920f1c93782a6bed60a8c50a80
parent4ed3067d89f7c423587baa7613ebe0bf211bd8a1 (diff)
parentf730a8d68034783200481a9334a2a7455e90cdd8 (diff)
Merge pull request #212 from webmaster128/gen-amalgamation-doesnt-build-via-amalgamation
Tie static build check to --via-amalgamation, not --gen-amalgamation
-rwxr-xr-xconfigure.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.py b/configure.py
index 3008fb85f..2e5accfd3 100755
--- a/configure.py
+++ b/configure.py
@@ -1895,7 +1895,7 @@ def main(argv = None):
logging.info('Disabling assembly code, cannot use in amalgamation')
options.asm_ok = False
- if not options.build_shared_lib and not options.gen_amalgamation:
+ if not options.build_shared_lib and not options.via_amalgamation:
raise Exception('Static build is only supported using amalgamation. '
'Add --via-amalgamation.')