summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--Makefile.rules8
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cc47f0d9cf..f2044fa5ca 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 f9ca8e688b..7bef650788 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