Don't statically link Boost by default #20

Since this would only be needed for distribution, and we're already
doing something similar for libstdc++ on the Ubuntu 18.04 build. This
moves the static linking behind a new build option.
This commit is contained in:
Robbert van der Helm
2020-06-08 15:46:09 +02:00
parent 9ecb65664c
commit 9385360331
4 changed files with 25 additions and 5 deletions
+2 -2
View File
@@ -51,7 +51,7 @@ jobs:
# Statically link to libstdc++ on Ubuntu 18.04 as we're compiling
# with a newer version of g++ than what's in the default repos
meson setup --buildtype=release --cross-file cross-wine.conf -Duse-bitbridge=true -Dcpp_link_args='-static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++' build
meson setup --buildtype=release --cross-file cross-wine.conf -Dwith-static-boost=true -Duse-bitbridge=true -Dcpp_link_args='-static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++' build
ninja -C build
- name: Create an archive for the binaries
run: |
@@ -91,7 +91,7 @@ jobs:
mkdir -p /tmp/prefix
export WINEPREFIX=/tmp/prefix
meson setup --buildtype=release --cross-file cross-wine.conf -Duse-bitbridge=true build
meson setup --buildtype=release --cross-file cross-wine.conf -Dwith-static-boost=true -Duse-bitbridge=true build
ninja -C build
- name: Create an archive for the binaries
run: |