Skip to content
Snippets Groups Projects
Commit 02cd68d2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

contrib: fix pkg-config tool detection

Attempt to set the platform-specific pkg-config tool *before* the
native/generic one.
parent 26ec9983
No related branches found
No related tags found
1 merge request!1306contrib: fix pkg-config tool detection
Pipeline #184190 passed with stage
in 17 minutes and 55 seconds
......@@ -235,7 +235,6 @@ export ACLOCAL_AMFLAGS
# Tools #
#########
PKG_CONFIG ?= pkg-config
need_pkg = $(shell $(PKG_CONFIG) $(1) || echo 1)
ifdef HAVE_CROSS_COMPILE
......@@ -250,6 +249,8 @@ need_pkg = $(shell PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) $(PKG_CONFIG) $(1) ||
endif
endif # HAVE_CROSS_COMPILE
PKG_CONFIG ?= pkg-config
PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)
ifeq ($(findstring mingw32,$(BUILD)),mingw32)
PKG_CONFIG_PATH := $(shell cygpath -pm ${PKG_CONFIG_PATH})
......
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