From 1fbca8f2b9d2abc4e12981849c437d1c5a113dbc Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Fri, 23 Dec 2022 19:52:55 +0100 Subject: [PATCH] Revert "Also disable unity builds for Ubuntu 18.04" This reverts commit ebbe3810f700397bbf1233e607165eb882d1c060. --- .github/workflows/build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 710289e4..3018a568 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,11 +49,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 - # FIXME: Once the Wine versions affected by - # https://bugs.winehq.org/show_bug.cgi?id=53912 are no longer - # around, re-enable unity builds - # meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dbitbridge=true -Dcpp_link_args='-mwindows -static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++' - meson setup build --buildtype=release --cross-file=cross-wine.conf -Dbitbridge=true -Dcpp_link_args='-mwindows -static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++' + meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dbitbridge=true -Dcpp_link_args='-mwindows -static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++' ninja -C build - name: Strip remaining debug symbols run: strip build/libyabridge{,-chainloader}-{clap,vst2,vst3}.so build/yabridge-host{,-32}.exe.so