From 6a6878c614c8c6dbe81ee7a9f1176bdb52dc7dd7 Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Fri, 20 Dec 2024 16:23:46 -0600 Subject: [PATCH] Use 32 bit pkg-config in linux 32 bit CI jobs PKG_CONFIG_EXECTUABLE is a CMake variable that sets the pkg-config executable used, allowing the use of the 32 bit pkg-config when looking for pkg-config packages. The prior version of the 32 bit job actually used the 64 bit packages but that happened to work okay because the only things used from the 64 bit packages were header files, which are arch agnostic. --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce560d4cf..3ba9d9c99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,6 +130,7 @@ jobs: -D UPDATE_DEPS=ON \ -D BUILD_WERROR=ON \ -D SYSCONFDIR=/etc/not_vulkan \ + -D PKG_CONFIG_EXECUTABLE=/usr/bin/i686-linux-gnu-pkg-config \ -G Ninja env: CFLAGS: -m32 @@ -166,6 +167,7 @@ jobs: -D UPDATE_DEPS=ON \ -D BUILD_WERROR=ON \ -D USE_GAS=OFF \ + -D PKG_CONFIG_EXECUTABLE=/usr/bin/i686-linux-gnu-pkg-config \ -G Ninja env: CFLAGS: -m32