diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-06-18 23:09:29 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-06-18 23:09:29 +0000 |
| commit | 498bb02fc7d2539d41b778bc42e383ca8dbf6d9e (patch) | |
| tree | a4192c19dd6f28a2547b647ffb1a385ac3e7b802 /config | |
| parent | fd6af9181e763cd9564245114cfa47f3952484db (diff) | |
"statistics" and "staticbinary" are now tags on the build (so you get build directories like builds/x86_64-unknown-linux-gnu/debug-staticbinary-nostatistics .. etc. This is useful to distinguish static binary builds and statistics builds from each other when you configure multiple times in the same source directory
Diffstat (limited to 'config')
| -rwxr-xr-x | config/build-type | 3 | ||||
| -rw-r--r-- | config/cvc4.m4 | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config/build-type b/config/build-type index 5c48f8fef..15214bcf0 100755 --- a/config/build-type +++ b/config/build-type @@ -20,6 +20,7 @@ # # The overrides are as follows: # +# staticbinary # optimized # debugsymbols # assertions @@ -46,7 +47,7 @@ while [ $# -gt 0 ]; do done build_type_suffix= -for arg in optimized debugsymbols assertions tracing muzzle coverage profiling; do +for arg in staticbinary optimized debugsymbols statistics assertions tracing muzzle coverage profiling; do if eval [ -n '"${'$arg'+set}"' ]; then if eval [ '"${'$arg'}"' -eq 0 ]; then build_type_suffix=$build_type_suffix-no$arg diff --git a/config/cvc4.m4 b/config/cvc4.m4 index 8106f1383..90f4ca093 100644 --- a/config/cvc4.m4 +++ b/config/cvc4.m4 @@ -22,7 +22,7 @@ do ac_option_build=`expr "$ac_option" : '\([[^-]]*\)-\?'` ac_cvc4_build_profile_set=yes AC_MSG_NOTICE([CVC4: building profile $ac_option_build]) - for x in optimized assertions tracing muzzle coverage profiling; do + for x in optimized statistics assertions tracing muzzle coverage profiling; do if expr "$ac_option" : '.*-no'$x'-\|.*-no'$x'$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-$x\""' fi @@ -30,6 +30,12 @@ do eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-$x\""' fi done + if expr "$ac_option" : '.*-nostaticbinary-\|.*-nostaticbinary$' >/dev/null; then + eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-static-binary\""' + fi + if expr "$ac_option" : '.*-staticbinary-\|.*-staticbinary$' >/dev/null; then + eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-static-binary\""' + fi if expr "$ac_option" : '.*-nodebugsymbols-\|.*-nodebugsymbols$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-debug-symbols\""' fi |