build: move STAGING_DIR_HOSTPKG and BUILD_DIR_HOST back to a common directory for...

[openwrt/staging/lynxis/omap.git] / include / host-build.mk

diff --git a/include/host-build.mk b/include/host-build.mk
index c54ee3755cfa6cb547694ad4f44a265e08440b38..6c2f91581b895bda1ee9f2ee94afc2e5c06de380 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -69,7 +69,8 @@ HOST_CONFIGURE_ARGS = \
 
 HOST_MAKE_VARS = \
        CFLAGS="$(HOST_CFLAGS)" \
-       CXXFLAGS="$(HOST_CPPFLAGS)" \
+       CPPFLAGS="$(HOST_CPPFLAGS)" \
+       CXXFLAGS="$(HOST_CXXFLAGS)" \
        LDFLAGS="$(HOST_LDFLAGS)"
 
 HOST_MAKE_FLAGS =
@@ -121,7 +122,7 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
 endif
 
 define Host/Exports/Default
-  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
+  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
   $(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
   $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig:$$(HOST_BUILD_PREFIX)/lib/pkgconfig
   $(1) : export PKG_CONFIG_LIBDIR=$$(HOST_BUILD_PREFIX)/lib/pkgconfig