diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-06-26 01:44:58 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-06-26 01:44:58 +0200 |
| commit | 6d3873ba4b91337fede90b317ac2dcc9c476d110 (patch) | |
| tree | 3e4e5356ba1ad50082021347fdbbcb8ebec9f51c /mk | |
| parent | f5098e6295be6c59c4f3e0d08640c4d4545dec34 (diff) | |
| download | embtoolkit-6d3873ba4b91337fede90b317ac2dcc9c476d110.tar.gz embtoolkit-6d3873ba4b91337fede90b317ac2dcc9c476d110.tar.bz2 embtoolkit-6d3873ba4b91337fede90b317ac2dcc9c476d110.tar.xz | |
Build system: fix PKG_CONFIG_PATH for target and host
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
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) |