[vlc-commits] [Git][videolan/vlc][master] contrib: fix pkg-config tool detection

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
02cd68d2 by Rémi Denis-Courmont at 2022-01-27T07:25:23+00:00
contrib: fix pkg-config tool detection

Attempt to set the platform-specific pkg-config tool *before* the
native/generic one.

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -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})



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/02cd68d219ae5aa41438b9bb4eeaeb5a51a7cc0d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/02cd68d219ae5aa41438b9bb4eeaeb5a51a7cc0d
You're receiving this email because of your account on code.videolan.org.