From: Daniel Dunbar Date: Fri, 11 Nov 2011 22:59:45 +0000 (+0000) Subject: cross-build/Make: Update cross build to properly forward ARCH and X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01b825d45b6f067e42e4c3d160b87f34459aab8c;p=oota-llvm.git cross-build/Make: Update cross build to properly forward ARCH and TARGETS_TO_BUILD variables to build tools submake, and also tweak echo command to indicate when we are compiling/etc build tools. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144419 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/Makefile b/Makefile index cc47f0d9cf9..f2044fa5ca9 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,8 @@ cross-compile-build-tools: $(MAKE) -C BuildTools \ BUILD_DIRS_ONLY=1 \ UNIVERSAL= \ + ARCH="$(ARCH)" \ + TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \ ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \ ENABLE_PROFILING=$(ENABLE_PROFILING) \ ENABLE_COVERAGE=$(ENABLE_COVERAGE) \ diff --git a/Makefile.rules b/Makefile.rules index f9ca8e688b8..7bef6507884 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -506,8 +506,12 @@ endif #-------------------------------------------------------------------- # Full Paths To Compiled Tools and Utilities #-------------------------------------------------------------------- -EchoCmd = $(ECHO) llvm[$(MAKELEVEL)]: -Echo = @$(EchoCmd) +EchoCmd := $(ECHO) llvm[$(MAKELEVEL)]: +ifdef BUILD_DIRS_ONLY +EchoCmd := $(EchoCmd) "(build tools)": +endif + +Echo := @$(EchoCmd) ifndef LLVMAS LLVMAS := $(LLVMToolDir)/llvm-as$(EXEEXT) endif