summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-08 23:47:41 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-08 23:47:41 +0100
commite080e435504ff8c6e845b2cb28b160f622390b03 (patch)
tree31540dbd73ed72ec409c8ddcd5edfca8dc9188b0
parentcfb2369bebbb692e08d664e07b43f209295c3d0c (diff)
downloadembtoolkit-e080e435504ff8c6e845b2cb28b160f622390b03.tar.gz
embtoolkit-e080e435504ff8c6e845b2cb28b160f622390b03.tar.bz2
embtoolkit-e080e435504ff8c6e845b2cb28b160f622390b03.tar.xz
Revert "Host tools: ccache: set CCACHE_BASEDIR to main build directory"
This reverts commit cfb2369bebbb692e08d664e07b43f209295c3d0c. It is useless
-rw-r--r--mk/buildsystem.mk1
-rw-r--r--mk/ccache.mk4
2 files changed, 1 insertions, 4 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk
index 2a9d494..f1ef0ca 100644
--- a/mk/buildsystem.mk
+++ b/mk/buildsystem.mk
@@ -37,7 +37,6 @@ J := -j$(CONFIG_EMBTK_NUMBER_BUILD_JOBS)
# New version of above variables names. The old names are scheduled for removal
#
embtk_sysroot := $(SYSROOT)
-embtk_build := $(EMBTK_ROOT)/build
embtk_tools := $(TOOLS)
embtk_toolsb := $(TOOLS_BUILD)
embtk_pkgb := $(PACKAGES_BUILD)
diff --git a/mk/ccache.mk b/mk/ccache.mk
index 8340720..5111ba4 100644
--- a/mk/ccache.mk
+++ b/mk/ccache.mk
@@ -37,7 +37,6 @@ CCACHE_BUILD_DIR := $(embtk_toolsb)/ccachehost-build
CCACHE_HOST_DIR := $(embtk_htools)/usr/local/ccachehost
CCACHE_DIR := $(EMBTK_ROOT)/.ccache
-CCACHE_BASEDIR := $(embtk_build)
CCACHE_BIN := $(CCACHE_HOST_DIR)/bin/ccache
# Variables for use in env
@@ -66,8 +65,7 @@ targetgcxx_cached := $(CCACHE_BIN) $(TARGETGCXX)
targetclang_cached := $(CCACHE_BIN) $(TARGETCLANG)
targetclangxx_cached := $(CCACHE_BIN) $(TARGETCLANGXX)
-export CCACHE_DIR CCACHE_BASEDIR
-export HOSTCC_CACHED HOSTCXX_CACHED TARGETCC_CACHED TARGETCXX_CACHED
+export CCACHE_DIR HOSTCC_CACHED HOSTCXX_CACHED TARGETCC_CACHED TARGETCXX_CACHED
CCACHE_PREFIX := $(CCACHE_HOST_DIR)