aboutsummaryrefslogtreecommitdiffstats
path: root/build-root
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-03-14 22:09:22 +0100
committerDamjan Marion <damarion@cisco.com>2018-03-15 02:09:05 +0100
commit92b44ea50a21b878b35f081bfc90c06b799c0c03 (patch)
treec674c282527dcdad6587128ac966410e313f7063 /build-root
parent1fcbd728095b4fbb3e1b4a757f3bc3f19ba879c7 (diff)
use system provided ccache links
Change-Id: I0860bbd0cf368fc3638b861504ebf642ee9d3807 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-root')
-rw-r--r--build-root/Makefile3
-rwxr-xr-xbuild-root/bootstrap.sh15
-rw-r--r--build-root/build-config.mk1
3 files changed, 4 insertions, 15 deletions
diff --git a/build-root/Makefile b/build-root/Makefile
index 9190803c3ab..9d8cffd69df 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -317,7 +317,8 @@ endif
BUILD_ENV = \
export CCACHE_DIR=$(CCACHE_DIR) ; \
- export PATH=$(TOOL_INSTALL_DIR)/ccache-bin:$(TOOL_INSTALL_DIR)/bin:$${PATH} ; \
+ export PATH=$(wildcard /usr/lib*/ccache):$(TOOL_INSTALL_DIR)/bin:$${PATH} ; \
+ $(if $(call configure_var_fn,PATH), export PATH=$${PATH}:$(call configure_var_fn,PATH);,) \
export PATH="`echo $${PATH} | sed -e s/[.]://`" ; \
$(if $(not_native),export CONFIG_SITE=$(MU_BUILD_ROOT_DIR)/config.site ;,) \
set -eu$(BUILD_DEBUG) ; \
diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh
index c3b355b4f8c..ec4f6436fda 100755
--- a/build-root/bootstrap.sh
+++ b/build-root/bootstrap.sh
@@ -23,10 +23,7 @@ if [[ ! $CCACHE_DIR ]];then
fi
ADD_TO_PATH="$build_root/tools/ccache-bin:$build_root/tools/bin"
-# Construct build-config.mk
cd $build_root
-echo SOURCE_PATH = $wsroot > build-config.mk
-echo
echo Saving PATH settings in `pwd`/path_setup
echo Source this file later, as needed
cat >path_setup <<EOF
@@ -37,23 +34,13 @@ export CCACHE_DIR=$CCACHE_DIR
EOF
# regenerate tools/ccache-bin
-rm -rf tools/ccache-bin
-mkdir -p tools/ccache-bin tools/bin
+mkdir -p tools/bin
if [ ! -f /usr/bin/ccache ] ; then
echo CCACHE is required. Please install it!
exit 1
fi
-cd tools/ccache-bin
-for c in gcc g++ clang clang++
-do
- ln -s /usr/bin/ccache $c
-done
-cd ../
-ln -s $wsroot/src/tools/vppapigen/vppapigen \
- $build_root/tools/bin/vppapigen
-
cd $build_root
exit 0
diff --git a/build-root/build-config.mk b/build-root/build-config.mk
new file mode 100644
index 00000000000..63683e01295
--- /dev/null
+++ b/build-root/build-config.mk
@@ -0,0 +1 @@
+SOURCE_PATH = $(CURDIR)/..