X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-root%2FMakefile;h=a3335236c041c19fc74fd0756a38bfa8f341e262;hb=642829de7958d5cd9c1c88f9845385882a7c211d;hp=8154ecdaa7b5c9e2ac53301e29a55465e5d1a73c;hpb=9d42087149a6870965896be74dc6260f72d2cac9;p=vpp.git

diff --git a/build-root/Makefile b/build-root/Makefile
index 8154ecdaa7b..a3335236c04 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) ;							        \
@@ -647,8 +648,12 @@ configure_check_timestamp =						\
 # we assume there's 1 processor; we use 2*ncpu for the -j option.
 # NB: GNU Make 4.2 will let us use '$(file </proc/cpuinfo)' to both test
 # for file presence and content; for now this will have to do.
+ifndef MAKE_PARALLEL_JOBS
 MAKE_PARALLEL_JOBS = -j $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
 	$(shell grep -c ^processor /proc/cpuinfo), 2)
+else
+MAKE_PARALLEL_JOBS := -j $(MAKE_PARALLEL_JOBS)
+endif
 MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,$(MAKE_PARALLEL_JOBS))
 
 # Make command shorthand for packages & tools.
@@ -929,11 +934,7 @@ install-packages: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	      basic_system							\
 	      $(ROOT_PACKAGES))	|| exit 1;					\
 	$(call build_msg_fn, Relocating ELF executables to run in $${d}) ;	\
-	find $${d} -type f							\
-	    -exec elftool quiet in '{}' out '{}'				\
-		set-interpreter							\
-		    $${d}/$(arch_lib_dir)/$(DYNAMIC_LINKER)			\
-		set-rpath $${d}/$(arch_lib_dir):$${d}/lib ';' ;			\
+	scripts/set-rpath $${d} $${d}/$(arch_lib_dir) ;				\
 	: strip symbols from files ;						\
 	if [ $${strip_symbols:-no} = 'yes' ] ; then				\
 	    $(call build_msg_fn, Stripping symbols from files) ;		\
@@ -968,11 +969,7 @@ $(PLATFORM_IMAGE_DIR)/ro.img ro-image: $(patsubst %,%-find-source,$(ROOT_PACKAGE
 	  : make dev directory ;					\
 	  $(linuxrc_makedev) ;						\
 	  echo @@@@ Relocating ELF executables to run in / @@@@ ;	\
-	  find $${d} -type f						\
-	      -exec elftool quiet in '{}' out '{}'			\
-		set-interpreter						\
-		    /$(arch_lib_dir)/$(DYNAMIC_LINKER)			\
-	        set-rpath /$(arch_lib_dir):/lib ';' ;			\
+	  scripts/set-rpath /$(arch_lib_dir):/lib ;			\
 	  : strip symbols from files ;					\
 	  if [ '$${strip_symbols:-yes}' = 'yes' ] ; then		\
 	      echo @@@@ Stripping symbols from files @@@@ ;		\