summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-11-11 22:59:45 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-11-11 22:59:45 +0000
commit01b825d45b6f067e42e4c3d160b87f34459aab8c (patch)
treeac88c3d2411129efc2397ce1e9858bb219a1b046
parent9969bc963511a89d8fc1e99b8e00cbc2ff73d6a9 (diff)
downloadllvm-01b825d45b6f067e42e4c3d160b87f34459aab8c.tar.gz
llvm-01b825d45b6f067e42e4c3d160b87f34459aab8c.tar.bz2
llvm-01b825d45b6f067e42e4c3d160b87f34459aab8c.tar.xz
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
-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