diff options
| author | Gereon Kremer <nafur42@gmail.com> | 2021-09-30 12:15:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 19:15:24 +0000 |
| commit | 65e5a909b10855d2e6b3844f7bc4efb7fbe4fe2f (patch) | |
| tree | bb541a32e3985be59ffdc323038677bbace24ede /configure.sh | |
| parent | 5a824c9e67789a529e34b7e2a7229986412bf979 (diff) | |
Refactor our static builds (#7251)
This PR does a major refactoring on how we organize our builds to allow both shared and static builds. We now build the libraries using object libraries to allow building the libraries both dynamically and statically in the same build folder, though the static library is optional (ENABLE_STATIC_LIBRARY). The binary is linked either dynamically or statically (depending on ENABLE_STATIC_BINARY).
Diffstat (limited to 'configure.sh')
| -rwxr-xr-x | configure.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.sh b/configure.sh index 07c1cc4ae..4fc274612 100755 --- a/configure.sh +++ b/configure.sh @@ -131,7 +131,7 @@ python2=default python_bindings=default java_bindings=default editline=default -shared=default +static_library=default static_binary=default statistics=default tracing=default @@ -249,8 +249,8 @@ do --muzzle) muzzle=ON;; --no-muzzle) muzzle=OFF;; - --static) shared=OFF; static_binary=ON;; - --no-static) shared=ON;; + --static) static_library=ON; static_binary=ON;; + --no-static) static_library=OFF;; --static-binary) static_binary=ON;; --no-static-binary) static_binary=OFF;; @@ -356,8 +356,8 @@ fi [ $ninja != default ] && cmake_opts="$cmake_opts -G Ninja" [ $muzzle != default ] \ && cmake_opts="$cmake_opts -DENABLE_MUZZLE=$muzzle" -[ $shared != default ] \ - && cmake_opts="$cmake_opts -DENABLE_SHARED=$shared" +[ $static_library != default ] \ + && cmake_opts="$cmake_opts -ENABLE_STATIC_LIBRARY=$static_library" [ $static_binary != default ] \ && cmake_opts="$cmake_opts -DENABLE_STATIC_BINARY=$static_binary" [ $statistics != default ] \ |