From 43164b34b1d1720952ebfc402285c4d369f1d71c Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Mon, 18 Jan 2010 06:48:12 +0000
Subject: [PATCH] Rename DebugMake variable to DEBUGMAKE for consistency
 (variables that are designed to be overridden), and use VERBOSE=1 instead of
 VERBOSE!="" for controlling verbosity.

llvm-svn: 93712
---
 compiler-rt/make/config.mk | 5 ++++-
 compiler-rt/make/subdir.mk | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler-rt/make/config.mk b/compiler-rt/make/config.mk
index f0663aa7f4fe..485119186951 100644
--- a/compiler-rt/make/config.mk
+++ b/compiler-rt/make/config.mk
@@ -65,11 +65,14 @@ RANLIB.Flags := 2> /dev/null
 LIPO := lipo
 CP := cp
 
+VERBOSE := 0
+DEBUGMAKE := 0
+
 ###
 # Automatic and derived variables.
 
 # Adjust settings for verbose mode
-ifndef VERBOSE
+ifneq ($(VERBOSE),1)
   Verb := @
 else
   Verb :=
diff --git a/compiler-rt/make/subdir.mk b/compiler-rt/make/subdir.mk
index 1fe427336b4e..81e29582097b 100644
--- a/compiler-rt/make/subdir.mk
+++ b/compiler-rt/make/subdir.mk
@@ -4,7 +4,7 @@ ifeq ($(Dir),)
   $(error "No Dir variable defined.")
 endif
 
-ifeq ($(DebugMake),1)
+ifeq ($(DEBUGMAKE),1)
   $(info MAKE: $(Dir): Processing subdirectory)
 endif
 
@@ -39,7 +39,7 @@ $(foreach config,$(ConfigsToTraverse), \
 SubDirsList := $(SubDirs:%=$(Dir)/%)
 ifeq ($(SubDirsList),)
 else
-  ifeq ($(DebugMake),1)
+  ifeq ($(DEBUGMAKE),1)
     $(info MAKE: Descending into subdirs: $(SubDirsList))
   endif
   $(foreach subdir,$(SubDirsList),$(eval include $(subdir)/Makefile.mk))