From 4c0dfe57c3658eb95e4c88f7770e1a0e40eb5624 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Tue, 5 Jun 2012 21:26:35 +0200 Subject: Build system macros: little tweak of embtk_configure_hostpkg Signed-off-by: Abdoulaye Walsimou Gaye --- mk/macros.packages.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 57f3680..b7a5753 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -304,9 +304,12 @@ endef # Usage: # $(call embtk_configure_hostpkg,PACKAGE) # -__embtk_hostpkg_rpathldflags="-Wl,-rpath,$(HOSTTOOLS)/usr/lib" -__embtk_hostpkg_rpath=$(strip $(if $(__embtk_pkg_setrpath), \ - $(__embtk_hostpkg_rpathldflags))) +__embtk_hostpkg_rpathldflags = "-Wl,-rpath,$(HOSTTOOLS)/usr/lib" +__embtk_hostpkg_rpath = $(strip $(if $(__embtk_pkg_setrpath), \ + $(__embtk_hostpkg_rpathldflags))) + +__embtk_hostpkg_ldflags = -L$(HOSTTOOLS)/usr/lib $(__embtk_hostpkg_rpath) +__embtk_hostpkg_cppflags = -I$(HOSTTOOLS)/usr/include define embtk_configure_hostpkg $(if $(EMBTK_BUILDSYS_DEBUG), $(call embtk_pinfo,"Configure $(__embtk_pkg_package) for host...")) @@ -314,8 +317,8 @@ define embtk_configure_hostpkg $(Q)test -e $(__embtk_pkg_srcdir)/configure || exit 1 $(call __embtk_print_configure_opts,$(__embtk_pkg_configureopts)) $(Q)cd $(__embtk_pkg_builddir); \ - CPPFLAGS="-I$(HOSTTOOLS)/usr/include" \ - LDFLAGS="-L$(HOSTTOOLS)/usr/lib $(__embtk_hostpkg_rpath)" \ + CPPFLAGS="$(__embtk_hostpkg_cppflags)" \ + LDFLAGS="$(__embtk_hostpkg_ldflags)" \ PKG_CONFIG="$(PKGCONFIG_BIN)" \ PKG_CONFIG_PATH="$(EMBTK_HOST_PKG_CONFIG_PATH)" \ $(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CC=$(HOSTCC_CACHED)) \ -- cgit v1.2.3