Index: tools/Makefile
===================================================================
--- tools/Makefile	(revision 135054)
+++ tools/Makefile	(working copy)
@@ -14,7 +14,7 @@
 
 # Build LLDB if present. Note LLDB must be built last as it depends on the
 # wider LLVM infrastructure (including Clang).
-OPTIONAL_DIRS := lldb
+OPTIONAL_DIRS := lldb cling
 
 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load

Index: tools/Makefile
===================================================================
--- tools/Makefile	(revision 154661)
+++ tools/Makefile	(working copy)
@@ -22,6 +22,9 @@
 # Build LLDB if present. Note LLDB must be built last as it depends on the
 # wider LLVM infrastructure (including Clang).
 OPTIONAL_DIRS := lldb
+ifeq ($(NOCLING),)
+OPTIONAL_DIRS += cling
+endif
 
 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load

Add make variable NOCLING which disables the cling build
Add make variable NOCLING which disables the cling build


git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@43727 27541ba8-7e3a-0410-8455-c3a389f83636
