The same problem was being tracked in PR7652.

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 1ea2311f93f858a70a34e3b3cd568da55bb2b60f..9bc74fe3fa4cd8a6939d216a5487f27372877a9b 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,23 +1,52 @@
 ##===- tools/Makefile --------------------------------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
-# 
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-# Note .. the tools are organized in triples consisting of one large and two
-# small executables. This is done to minimize memory load in parallel builds.
-# Please retain this ordering.
-PARALLEL_DIRS := llvm-config \
-                 opt llvm-as llvm-dis \
-                 llc llvm-ranlib llvm-ar \
-                lli llvm-link llvm-nm \
-                bugpoint llvm-db llvm-extract \
-                 gccas llvm-bcanalyzer llvm-stub \
-                gccld llvm2cpp \
-                 llvm-ld llvmc llvm-prof
+
+# Build clang if present.
+OPTIONAL_PARALLEL_DIRS := clang
+
+# 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
+# in parallel builds.  Please retain this ordering.
+
+# libEnhancedDisassembly must be built ahead of llvm-mc
+# because llvm-mc links against libEnhancedDisassembly
+DIRS := llvm-config edis llvm-mc
+PARALLEL_DIRS := opt llvm-as llvm-dis \
+                 llc llvm-ranlib llvm-ar llvm-nm \
+                 llvm-ld llvm-prof llvm-link \
+                 lli llvm-extract \
+                 bugpoint llvm-bcanalyzer llvm-stub \
+                 llvmc
+
+# Let users override the set of tools to build from the command line.
+ifdef ONLY_TOOLS
+  OPTIONAL_PARALLEL_DIRS :=
+  PARALLEL_DIRS := $(ONLY_TOOLS)
+endif
+
+include $(LEVEL)/Makefile.config
+
+# These libraries build as dynamic libraries (.dylib /.so), they can only be
+# built if ENABLE_PIC is set.
+ifeq ($(ENABLE_PIC),1)
+  # No support for dynamic libraries on windows targets.
+  ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
+    # gold only builds if binutils is around.  It requires "lto" to build before
+    # it so it is added to DIRS.
+    ifdef BINUTILS_INCDIR
+      DIRS += lto gold
+    else
+      PARALLEL_DIRS += lto
+    endif
+  endif
+endif
 
 include $(LEVEL)/Makefile.common