From c440fbce788d5ee7d9774e32286504fdb90b2eb6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 25 Oct 2022 20:51:38 +0200 Subject: [PATCH] Disable use of host pkg-config in wxiOS CI build Set PKG_CONFIG_LIBDIR=/dev/null explicitly to disable the use of the host libraries when cross-compiling. --- .github/workflows/ci_mac.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml index bd4902acbc..462c8ff536 100644 --- a/.github/workflows/ci_mac.yml +++ b/.github/workflows/ci_mac.yml @@ -93,6 +93,7 @@ jobs: runner: macos-11 arch: x86_64 configure_flags: --with-osx_iphone --enable-monolithic --disable-sys-libs --host=i686-apple-darwin_sim --build=x86_64-apple-darwin17.7.0 + configure_env: PKG_CONFIG_LIBDIR=/dev/null xcode_sdk: iphonesimulator skip_samples: true skip_testing: true @@ -171,9 +172,9 @@ jobs: wxASAN_CXXFLAGS=$wxASAN_CFLAGS wxASAN_LDFLAGS="-fsanitize=address" - ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$? + ${{ matrix.configure_env }} ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$? else - ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$? + ${{ matrix.configure_env }} ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$? fi if [ -n "$rc" ]; then echo '*** Configuring failed, contents of config.log follows: ***'