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 --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b3eb9cc285a..8168b9434da 100644 --- a/Makefile +++ b/Makefile @@ -262,8 +262,13 @@ else @mkdir -p $(BR)/tools/ccache-bin @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++ + @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/clang + @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/clang++ + @mkdir -p $(BR)/tools/bin + @rm -f $(BR)/tools/bin/vppapigen + @ln -s $(WS_ROOT)/src/tools/vppapigen/vppapigen \ + $(BR)/tools/bin/vppapigen endif - @make -C $(BR) V=$(V) is_build_tool=yes tools-install @touch $@ bootstrap: $(BR)/.bootstrap.ok @@ -327,7 +332,7 @@ dist: @ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz build: $(BR)/.bootstrap.ok - $(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS))) + $(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS))) wipedist: @$(RM) $(BR)/*.tar.xz -- cgit 1.2.3-korg