Skip to content
Snippets Groups Projects
Commit 74060949 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen
Browse files

contrib: meson: Don't override PKG_CONFIG_LIBDIR

When overriding the environment variable, we might cause a pkg-config
wrapper to skip setting its environment variable when cross compiling.
By providing an empty string, we'd effectively disable detection of all
available packages in a non-default path.
parent 44414977
Branches master
No related tags found
No related merge requests found
......@@ -429,7 +429,7 @@ ifdef HAVE_CROSS_COMPILE
# generated crossfile, so everything should work as
# expected.
MESONFLAGS += --cross-file $(abspath crossfile.meson)
MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
meson -Dpkg_config_path="$(PKG_CONFIG_PATH)" \
$(MESONFLAGS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment