From cc187fadce655d4806d450af8936c4c807ba18b8 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 29 Jun 2021 00:42:11 -0700 Subject: [PATCH] tools/make-windows-release: ensure the headers in tools/windeps/ are used Avoid a build error due to the libxml2 headers not being found. Previously it worked by chance due to the system headers being used. This stopped working in Cygwin builds for some reason, though. --- tools/make-windows-release | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/make-windows-release b/tools/make-windows-release index 5c652cee..3bd8e472 100755 --- a/tools/make-windows-release +++ b/tools/make-windows-release @@ -55,11 +55,15 @@ then # Note: putting -static-libgcc in CC is a workaround for libtool # stripping it: # http://www.gnu.org/software/libtool/manual/libtool.html#Stripped-link-flags + # + # We also need to override the MinGW pkg-config with the "native" one in + # order for it to correctly restrict the include path to our $SYSROOT. ./configure --host=${ARCH}-w64-mingw32 --disable-static \ CC="${ARCH}-w64-mingw32-gcc -static-libgcc" \ CPPFLAGS="-I$SYSROOT/include" \ LDFLAGS="-L$SYSROOT/lib" \ - PKG_CONFIG_PATH="$SYSROOT/lib/pkgconfig" \ + PKG_CONFIG=pkg-config \ + PKG_CONFIG_LIBDIR="$SYSROOT/lib/pkgconfig" \ --without-libcrypto \ $extra_args "$@" $MAKE clean -- 2.43.0