build: do not override CCACHE_DIR when ccache is disabled

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/include/host-build.mk b/include/host-build.mk
index a2a31ae0489b46b94961de78ad0c5a100588d921..827ea6bbfb1be72e38309de3fe48435e3aa8172f 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -132,7 +132,7 @@ define Host/Exports/Default
   $(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
-  $(1) : export CCACHE_DIR:=$(STAGING_DIR_HOST)/ccache
+  $(if $(CONFIG_CCACHE),$(1) : export CCACHE_DIR:=$(STAGING_DIR_HOST)/ccache)
   $(if $(HOST_CONFIG_SITE),$(1) : export CONFIG_SITE:=$(HOST_CONFIG_SITE))
   $(if $(IS_PACKAGE_BUILD),$(1) : export PATH=$$(TARGET_PATH_PKG))
 endef

diff --git a/include/package.mk b/include/package.mk
index 2473eecb922074e415496e1add86cf2c9c47cccb..a03db11119c454e0967c333bca59359c559754a3 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -144,7 +144,7 @@ define Build/Exports/Default
   $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
   $(1) : export PKG_CONFIG_PATH:=$$(PKG_CONFIG_PATH)
   $(1) : export PKG_CONFIG_LIBDIR:=$$(PKG_CONFIG_PATH)
-  $(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache
+  $(if $(CONFIG_CCACHE),$(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache)
 endef
 Build/Exports=$(Build/Exports/Default)