diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-10 19:30:55 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-10 19:30:55 +0200 |
| commit | b54e9dd0bd125480d46f446230d02525cca0bb23 (patch) | |
| tree | b6112f1557b41fb681789c34a8dff51f80907a17 | |
| parent | 72c4c684eef8f47f2f518278235d0ee8471c69ba (diff) | |
| download | embtoolkit-b54e9dd0bd125480d46f446230d02525cca0bb23.tar.gz embtoolkit-b54e9dd0bd125480d46f446230d02525cca0bb23.tar.bz2 embtoolkit-b54e9dd0bd125480d46f446230d02525cca0bb23.tar.xz | |
Build system: Use host tools pkgconfig path while building host packages
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.mk | 2 | ||||
| -rw-r--r-- | mk/pkgconfig.mk | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index a02e21e..7dc1d95 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -267,6 +267,8 @@ define embtk_configure_hostpkg @cd $($(PKGV)_BUILD_DIR); \ CPPFLAGS="-I$(HOSTTOOLS)/usr/include" \ LDFLAGS="-L$(HOSTTOOLS)/usr/lib -Wl,-rpath,$(HOSTTOOLS)/usr/lib" \ + PKG_CONFIG="$(PKGCONFIG_BIN)" \ + PKG_CONFIG_PATH="$(EMBTK_HOST_PKG_CONFIG_PATH)" \ $(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CC=$(HOSTCC_CACHED)) \ $(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CXX=$(HOSTCXX_CACHED)) \ $($(PKGV)_CONFIGURE_ENV) \ diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index 0cf4852..3ab70de 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -32,11 +32,13 @@ 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 -EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -EMBTK_PKG_CONFIG_LIBDIR := $(SYSROOT)/usr/$(LIBDIR) +PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config +EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig +EMBTK_PKG_CONFIG_LIBDIR := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig +EMBTK_HOST_PKG_CONFIG_PATH := $(HOSTTOOLS)/usr/lib/pkgconfig:/usr/lib/pkgconfig export PKGCONFIG_BIN EMBTK_PKG_CONFIG_PATH EMBTK_PKG_CONFIG_LIBDIR +export EMBTK_HOST_PKG_CONFIG_PATH PKGCONFIG_PREFIX := /usr PKGCONFIG_DESTDIR := $(HOSTTOOLS) |