More of PR728, don't install utils either.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28673 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile b/Makefile
index 550f2aff29fde5fc1d5c524968042714acc10e01..4b68b97a1eb87feeeb5efccb33a0d62dbade259b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,13 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#

+

 LEVEL = .
 DIRS = lib/System lib/Support utils lib/VMCore lib
 
 include $(LEVEL)/Makefile.config 
 
 LEVEL = .
 DIRS = lib/System lib/Support utils lib/VMCore lib
 
 include $(LEVEL)/Makefile.config 
 

+

 ifeq ($(MAKECMDGOALS),tools-only)
   DIRS += tools
 else
 ifeq ($(MAKECMDGOALS),tools-only)
   DIRS += tools
 else


@@ -22,15 +24,23 @@ else
       $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
     endif
 
       $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
     endif
 

-    # Don't install examples or projects.
-    ifneq ($(MAKECMDGOALS),install)
-      OPTIONAL_DIRS := examples projects
-    endif

     DIRS += docs
   endif
 endif
     DIRS += docs
   endif
 endif

+
+# Don't install utils, they are only used to build LLVM.
+#
+ifeq ($(MAKECMDGOALS),install)
+  DIRS := $(filter-out utils, $(DIRS))
+
+  # Don't install examples or projects.
+  OPTIONAL_DIRS :=
+endif
+
+

 EXTRA_DIST := test llvm.spec include win32 Xcode
 
 EXTRA_DIST := test llvm.spec include win32 Xcode
 

+# Include the main makefile machinery.

 include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're