diff options
| author | Gereon Kremer <nafur42@gmail.com> | 2021-10-28 12:30:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 19:30:13 +0000 |
| commit | 6fb31c779f91fa22186052224ceb38d48ba41fa9 (patch) | |
| tree | 6b379311000556e4d90889f0dae77cee2d0b196a /configure.sh | |
| parent | 22b0ff77781b957c3ed714dd7ac88fb8c5a8d25c (diff) | |
Combine `--static` and `--static-binary` (#7520)
This PR combines the two configure flags --static and --static-binary into a single --static. Consequently, the two corresponding cmake variables are combined as well. The two variables have been implying each other for some time now and were only used to build not-completely-static binaries for MacOS, which is now done automatically anyway.
Diffstat (limited to 'configure.sh')
| -rwxr-xr-x | configure.sh | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/configure.sh b/configure.sh index a8bf19b79..641be5c18 100755 --- a/configure.sh +++ b/configure.sh @@ -31,8 +31,6 @@ General options; Features: The following flags enable optional features (disable with --no-<option name>). --static build static libraries and binaries [default=no] - --static-binary statically link against system libraries - (must be disabled for static macOS builds) [default=yes] --auto-download automatically download dependencies if necessary --debug-symbols include debug symbols --valgrind Valgrind instrumentation @@ -131,8 +129,7 @@ python2=default python_bindings=default java_bindings=default editline=default -static_library=default -static_binary=default +static=default statistics=default tracing=default tsan=default @@ -249,11 +246,8 @@ do --muzzle) muzzle=ON;; --no-muzzle) muzzle=OFF;; - --static) static_library=ON; static_binary=ON;; - --no-static) static_library=OFF;; - - --static-binary) static_binary=ON;; - --no-static-binary) static_binary=OFF;; + --static) static=ON;; + --no-static) static=OFF;; --auto-download) auto_download=ON;; --no-auto-download) auto_download=OFF;; @@ -356,10 +350,8 @@ fi [ $ninja != default ] && cmake_opts="$cmake_opts -G Ninja" [ $muzzle != default ] \ && cmake_opts="$cmake_opts -DENABLE_MUZZLE=$muzzle" -[ $static_library != default ] \ - && cmake_opts="$cmake_opts -DENABLE_STATIC_LIBRARY=$static_library" -[ $static_binary != default ] \ - && cmake_opts="$cmake_opts -DENABLE_STATIC_BINARY=$static_binary" +[ $static != default ] \ + && cmake_opts="$cmake_opts -DENABLE_STATIC_BUILD=$static" [ $statistics != default ] \ && cmake_opts="$cmake_opts -DENABLE_STATISTICS=$statistics" [ $tracing != default ] \ |