From 5a72e425f9c2d5ca049fd05cd280c4bff5f73d57 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Tue, 13 Mar 2018 12:54:43 -0400 Subject: Clean up vpp build bootstrap step Net of rewriting vppapigen in python-ply, there's no need to compile vppinfra. Install a copy of vppapigen in .../build-root/tools/bin, so the sample plugin build will work. Rationalize suffix-rules.mk. Add clang, clang++ links to .../build-root/ccache-bin. Change-Id: Ib4017848b7767b6054238ea544ee5319667c3659 Signed-off-by: Dave Barach --- build-root/Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'build-root/Makefile') diff --git a/build-root/Makefile b/build-root/Makefile index 8154ecdaa7b..9190803c3ab 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -929,11 +929,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 +964,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 @@@@ ; \ -- cgit 1.2.3-korg