diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2021-03-10 11:40:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 19:40:15 +0000 |
| commit | 27fb04bc96999e101b45458c549345e864e085e9 (patch) | |
| tree | db3326985c464226c544c3b234ca772efa1854f9 /configure.sh | |
| parent | 99acb6adc4858e9228a75283c0d4a640ce7cc812 (diff) | |
cmake: Fix optimization level for debug builds. (#6097)
Further cleans up some unused variables and moves the configuration of
best to configure.sh.
Diffstat (limited to 'configure.sh')
| -rwxr-xr-x | configure.sh | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/configure.sh b/configure.sh index f39cbfb00..ed84a7270 100755 --- a/configure.sh +++ b/configure.sh @@ -33,7 +33,6 @@ The following flags enable optional features (disable with --no-<option name>). --static-binary statically link against system libraries (must be disabled for static macOS builds) [default=yes] --proofs support for proof generation - --optimized optimize the build --debug-symbols include debug symbols --valgrind Valgrind instrumentation --debug-context-mm use the debug context memory manager @@ -117,7 +116,6 @@ buildtype=default abc=default asan=default assertions=default -best=default cadical=default cln=default comp_inc=default @@ -134,7 +132,6 @@ lfsc=default poly=default muzzle=default ninja=default -optimized=default profiling=default proofs=default python2=default @@ -193,8 +190,15 @@ do --assertions) assertions=ON;; --no-assertions) assertions=OFF;; - --best) best=ON;; - --no-best) best=OFF;; + # Best configuration + --best) + abc=ON + cadical=ON + cln=ON + cryptominisat=ON + glpk=ON + editline=ON + ;; --prefix) die "missing argument to $1 (try -h)" ;; --prefix=*) @@ -261,9 +265,6 @@ do --muzzle) muzzle=ON;; --no-muzzle) muzzle=OFF;; - --optimized) optimized=ON;; - --no-optimized) optimized=OFF;; - --proofs) proofs=ON;; --no-proofs) proofs=OFF;; @@ -389,8 +390,6 @@ cmake_opts="" && cmake_opts="$cmake_opts -DENABLE_TSAN=$tsan" [ $assertions != default ] \ && cmake_opts="$cmake_opts -DENABLE_ASSERTIONS=$assertions" -[ $best != default ] \ - && cmake_opts="$cmake_opts -DENABLE_BEST=$best" [ $comp_inc != default ] \ && cmake_opts="$cmake_opts -DENABLE_COMP_INC_TRACK=$comp_inc" [ $coverage != default ] \ @@ -410,8 +409,6 @@ cmake_opts="" [ $ninja != default ] && cmake_opts="$cmake_opts -G Ninja" [ $muzzle != default ] \ && cmake_opts="$cmake_opts -DENABLE_MUZZLE=$muzzle" -[ $optimized != default ] \ - && cmake_opts="$cmake_opts -DENABLE_OPTIMIZED=$optimized" [ $proofs != default ] \ && cmake_opts="$cmake_opts -DENABLE_PROOFS=$proofs" [ $shared != default ] \ |