[vlc-commits] contrib: pass the PKG_CONFIG variable to all tools

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jan 31 09:55:55 2020 +0100| [798ac8d707af04661975649c5192f266848f26af] | committer: Steve Lhomme

contrib: pass the PKG_CONFIG variable to all tools

So it's used by make, meson and CMake.
No need to set it in the CMake toolchain file anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=798ac8d707af04661975649c5192f266848f26af
---

 contrib/src/main.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 85e4dbb878..555d96a4b4 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -299,7 +299,8 @@ endif
 HOSTTOOLS := \
 	CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
 	AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
-	PATH="$(PREFIX)/bin:$(PATH)"
+	PATH="$(PREFIX)/bin:$(PATH)" \
+	PKG_CONFIG="$(PKG_CONFIG)"
 
 HOSTVARS_MESON := $(HOSTTOOLS) \
 	CPPFLAGS="$(CPPFLAGS)" \
@@ -595,7 +596,6 @@ endif
 ifdef HAVE_CROSS_COMPILE
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> $@
 	echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@
-	echo "set(PKG_CONFIG_EXECUTABLE $(PKG_CONFIG))" >> $@
 endif
 
 MESON_SYSTEM_NAME =