From 5eb3773b99080d4af8d73dfdbaa4293bb3497e6f Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nicholas@mxc.ca>
Date: Thu, 26 Feb 2009 07:56:49 +0000
Subject: [PATCH] Force 'llvm-config' to go first, optionally followed by lto
 and gold mixed in with the rest of the parallel directories.

Build lto when possible on all platforms. Make gold to explicitly depend on
libLTO.

llvm-svn: 65518
---
 llvm/tools/Makefile      | 17 +++++++----------
 llvm/tools/gold/Makefile |  1 +
 llvm/tools/lto/Makefile  |  8 ++------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile
index a296f8187024..7305f6bafebc 100644
--- a/llvm/tools/Makefile
+++ b/llvm/tools/Makefile
@@ -15,23 +15,20 @@ 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.
-PARALLEL_DIRS := llvm-config  \
-                 opt llvm-as llvm-dis \
+DIRS := llvm-config
+PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
 		 lli gccas gccld llvm-extract llvm-db \
 		 bugpoint llvm-bcanalyzer llvm-stub llvmc
 
-
 include $(LEVEL)/Makefile.config
 
-# only build new lto project on Darwin for now
-ifeq ($(OS),Darwin)
-PARALLEL_DIRS += lto
-
-ifdef BINUTILS_INCDIR
-PARALLEL_DIRS += gold
-endif
+ifdef ENABLE_PIC
+  DIRS += lto
+  ifdef BINUTILS_INCDIR
+    DIRS += gold
+  endif
 endif
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/tools/gold/Makefile b/llvm/tools/gold/Makefile
index 37a7e4ef7fcb..eccffcbda6b9 100644
--- a/llvm/tools/gold/Makefile
+++ b/llvm/tools/gold/Makefile
@@ -21,6 +21,7 @@ BUILD_ARCHIVE = 0
 DONT_BUILD_RELINKED = 1
 
 LINK_COMPONENTS :=
+LIBS += -llto
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile
index 69014d781ff1..f0f6da7191a2 100644
--- a/llvm/tools/lto/Makefile
+++ b/llvm/tools/lto/Makefile
@@ -16,12 +16,8 @@ LIBRARYNAME = LTO
 include $(LEVEL)/Makefile.config
 
 LINK_LIBS_IN_SHARED = 1
-ifeq ($(OS),Darwin)
-  SHARED_LIBRARY = 1
-  DONT_BUILD_RELINKED = 1
-else
-  BUILD_ARCHIVE = 1
-endif
+SHARED_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter