diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak index ae5cfac655..5b5ecc29d6 100644 --- a/contrib/src/lua/rules.mak +++ b/contrib/src/lua/rules.mak @@ -49,10 +49,10 @@ endif endif endif -ifeq ($(shell $(HOST)-luac -v 2>/dev/null | head -1 | sed -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),$(LUA_SHORTVERSION)) +ifeq ($(shell PATH="${SYSTEM_PATH}" $(HOST)-luac -v 2>/dev/null | head -1 | sed -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),$(LUA_SHORTVERSION)) PKGS_FOUND += luac endif -ifeq ($(shell $(HOST)-luac -v 2>/dev/null | head -1 | sed -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),5.2) +ifeq ($(shell PATH="${SYSTEM_PATH}" $(HOST)-luac -v 2>/dev/null | head -1 | sed -E 's/Lua ([0-9]+).([0-9]+).*/\1.\2/'),5.2) PKGS_FOUND += luac endif diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 33653458b7..68e94b9346 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -12,9 +12,6 @@ VLC_TOOLS ?= $(TOPSRC)/../extras/tools/build CMAKE_GENERATOR ?= Ninja -PATH :=$(abspath $(VLC_TOOLS)/bin):$(PATH) -export PATH - PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak)) DATE := $(shell date +%Y%m%d) VPATH := $(TARBALLS) @@ -41,6 +38,11 @@ PREFIX := $(abspath $(PREFIX)) BUILDPREFIX ?= $(PREFIX)/.. BUILDPREFIX := $(abspath $(BUILDPREFIX)) BUILDBINDIR ?= $(BUILDPREFIX)/bin + +SYSTEM_PATH := $(abspath $(VLC_TOOLS)/bin):$(PATH) +PATH :=$(abspath $(BUILDBINDIR)):$(SYSTEM_PATH) +export PATH + ifneq ($(HOST),$(BUILD)) HAVE_CROSS_COMPILE = 1 endif diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak index 5bb9737553..bf512965ac 100644 --- a/contrib/src/protobuf/rules.mak +++ b/contrib/src/protobuf/rules.mak @@ -20,7 +20,7 @@ endif endif PKGS.tools.protoc.path = $(BUILDBINDIR)/protoc -ifeq ($(shell protoc --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(PROTOBUF_MAJVERSION)) +ifeq ($(shell PATH="${SYSTEM_PATH}" protoc --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(PROTOBUF_MAJVERSION)) PKGS_FOUND += protoc endif diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index a656910819..a49144ddff 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -28,7 +28,7 @@ endif ifndef HAVE_CROSS_COMPILE PKGS_FOUND += qt-tools endif -ifeq ($(shell qt-cmake --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),3.22) +ifeq ($(shell PATH="${SYSTEM_PATH}" qt-cmake --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),3.22) PKGS_FOUND += qt-tools endif diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak index d814ec0b0c..b952ee4ba5 100644 --- a/contrib/src/qtdeclarative/rules.mak +++ b/contrib/src/qtdeclarative/rules.mak @@ -25,7 +25,7 @@ endif ifndef HAVE_CROSS_COMPILE PKGS_FOUND += qtdeclarative-tools endif -ifeq ($(shell qml --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTDECLARATIVE_VERSION_MAJOR)) +ifeq ($(shell PATH="${SYSTEM_PATH}" qml --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTDECLARATIVE_VERSION_MAJOR)) PKGS_FOUND += qtshadertools-tools endif diff --git a/contrib/src/qtshadertools/rules.mak b/contrib/src/qtshadertools/rules.mak index b51ac9a618..a2fa4e9563 100644 --- a/contrib/src/qtshadertools/rules.mak +++ b/contrib/src/qtshadertools/rules.mak @@ -29,7 +29,7 @@ endif ifndef HAVE_CROSS_COMPILE PKGS_FOUND += qtshadertools-tools endif -ifeq ($(shell qsb --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTSHADERTOOLS_VERSION_MAJOR)) +ifeq ($(shell PATH="${SYSTEM_PATH}" qsb --version 2>/dev/null | head -1 | sed s/'.* '// | cut -d '.' -f -2),$(QTSHADERTOOLS_VERSION_MAJOR)) PKGS_FOUND += qtshadertools-tools endif