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 cc47f0d9cf90464a43205306bbfdb2472b80e38c..f2044fa5ca945de939b44832a2917b438619f15e 100644 (file)
--- 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 f9ca8e688b8883bd2b9909e4f5f7f75da6b0d8cd..7bef65078845e62da1a2d5de960343182c389dd6 100644 (file)
--- 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