diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/macros.mk | 2 | ||||
| -rw-r--r-- | mk/pkgconfig.mk | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index 77887dc..48f552d 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -244,7 +244,7 @@ define EMBTK_CONFIGURE_PKG LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ CPPFLAGS="-I$(SYSROOT)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ - PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ + PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ $($(1)_CONFIGURE_ENV) \ diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index 248f511..498e900 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -32,13 +32,10 @@ PKGCONFIG_PACKAGE := pkg-config-$(PKGCONFIG_VERSION).tar.gz PKGCONFIG_SRC_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) -PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH := $(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH := $(SYSROOT)/usr/lib/pkgconfig -endif -export PKGCONFIG_BIN +PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config +EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig + +export PKGCONFIG_BIN EMBTK_PKGCONFIGPATH pkgconfig_install: $(call EMBTK_INSTALL_HOSTPKG,PKGCONFIG) |