diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-01-18 19:47:36 +0100 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-01-18 19:47:36 +0100 |
commit | 3d71786154fbb3fcfbd652115f3e75db3f729941 (patch) | |
tree | a3d0ad55239a4a9bb526c88149e107a65fae6dc6 /include | |
parent | 5f7a081553edcfe3cf4ed9601297a5a17616cf99 (diff) | |
download | upstream-3d71786154fbb3fcfbd652115f3e75db3f729941.tar.gz upstream-3d71786154fbb3fcfbd652115f3e75db3f729941.tar.bz2 upstream-3d71786154fbb3fcfbd652115f3e75db3f729941.zip |
build: move STAGING_DIR_HOSTPKG and BUILD_DIR_HOST back to a common directory for all targets
Using a single host package staging dir (and build dir) significantly speeds up
builds when multiple targets are built in succession, especially for large host
packages like NodeJS.
$(STAGING_DIR)/host is kept in addition to $(STAGING_DIR_HOSTPKG) in most
places; it is still used as destination for host files in Build/InstallDev.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/autotools.mk | 2 | ||||
-rw-r--r-- | include/cmake.mk | 2 | ||||
-rw-r--r-- | include/host-build.mk | 2 | ||||
-rw-r--r-- | include/package.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index c6aa47e0be..7bd400ab36 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -75,7 +75,7 @@ define autoreconf_target $(strip $(call autoreconf, \ $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \ $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \ - $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS))) + $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR_HOSTPKG)/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS))) endef define patch_libtool_target diff --git a/include/cmake.mk b/include/cmake.mk index 5f572e9d74..80c1b05937 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -34,7 +34,7 @@ CMAKE_NM:=$(call cmake_tool,$(TARGET_NM)) CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB)) CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT)) -CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST) +CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST) CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions define Build/Configure/Default diff --git a/include/host-build.mk b/include/host-build.mk index 70bf6e5a39..6c2f91581b 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -122,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 diff --git a/include/package.mk b/include/package.mk index 3248517657..ea801288ea 100644 --- a/include/package.mk +++ b/include/package.mk @@ -130,7 +130,7 @@ ifdef USE_SOURCE_DIR endif define Build/Exports/Default - $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p)) + $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p)) $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr $(1) : export PATH=$$(TARGET_PATH_PKG) $(1) : export CONFIG_SITE:=$$(CONFIG_SITE) |