From 4fde5ae9681184150ddb449ff2923b039b99a2d1 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Wed, 9 Apr 2025 22:39:20 +0300 Subject: [PATCH] make/rules-common.mk: Specify CMAKE_PREFIX_PATH for cmake-only deps resolution. It used to work due to cmake's convoluted dependency resolution rules taking into account $PATH. Since it's now set a bit differently we have to explicitly point it to dependency directories. --- make/rules-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/rules-common.mk b/make/rules-common.mk index 55a821b5..1c8b262a 100644 --- a/make/rules-common.mk +++ b/make/rules-common.mk @@ -134,6 +134,7 @@ $(2)_$(3)_ENV = \ LD_LIBRARY_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_$(3)_HOST_DEPS),$$($$(d)_$$(HOST_ARCH)_LIBDIR)/$$($$(HOST_ARCH)-unix_LIBDIR)),,:)$$$$LD_LIBRARY_PATH" \ PKG_CONFIG_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_$(3)_DEPS),$$($$(d)_$(3)_LIBDIR)/$$($(3)-$(4)_LIBDIR)/pkgconfig))" \ PKG_CONFIG_LIBDIR="/usr/lib/$$($(3)-$(4)_LIBDIR)/pkgconfig:/usr/share/pkgconfig" \ + CMAKE_PREFIX_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_$(3)_DEPS),$$($$(d)_$(3)_DST)))" \ CFLAGS="$$($(2)_$(3)_INCFLAGS) $$($(2)_CFLAGS) $$($(3)_CFLAGS) $$(CFLAGS)" \ CPPFLAGS="$$($(2)_$(3)_INCFLAGS) $$($(2)_CFLAGS) $$($(3)_CFLAGS) $$(CFLAGS)" \ CXXFLAGS="$$($(2)_$(3)_INCFLAGS) -std=c++17 $$($(2)_CFLAGS) $$($(3)_CFLAGS) $$(CFLAGS)" \