From 8d2a94b0dfd2934392dd920e2f4982ac0ecb3d7c Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Tue, 15 Jun 2021 00:00:25 +0200 Subject: [PATCH] ci: Build both static and shared This allows us to validate the objcopy trick in CI. It's basically free to build both static and shared libraries anyway. We only enable this for GCC builds right now, as Meson currently lacks support for prelinking with other compilers. --- .builds/alpine.yml | 2 +- .builds/archlinux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.builds/alpine.yml b/.builds/alpine.yml index d69d5fbb2..f13c892ff 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -19,7 +19,7 @@ sources: tasks: - setup: | cd wlroots - meson build -Dauto_features=enabled -Dlibseat=disabled -Dxcb-errors=disabled + meson build --default-library=both -Dauto_features=enabled -Dlibseat=disabled -Dxcb-errors=disabled - build: | cd wlroots ninja -C build diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 12b847872..6986ea6a3 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -20,7 +20,7 @@ sources: tasks: - setup: | cd wlroots - CC=gcc meson build-gcc -Dauto_features=enabled --prefix /usr + CC=gcc meson build-gcc --default-library=both -Dauto_features=enabled --prefix /usr CC=clang meson build-clang -Dauto_features=enabled - gcc: | cd wlroots/build-gcc