[llvm-commits] [llvm] r65518 - in /llvm/trunk/tools: Makefile gold/Makefile lto/Makefile

[Nick Lewycky]

Author: nicholas
Date: Thu Feb 26 01:56:49 2009
New Revision: 65518

URL: http://llvm.org/viewvc/llvm-project?rev=65518&view=rev
Log:
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.

Modified:
    llvm/trunk/tools/Makefile
    llvm/trunk/tools/gold/Makefile
    llvm/trunk/tools/lto/Makefile

Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=65518&r1=65517&r2=65518&view=diff

==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Thu Feb 26 01:56:49 2009
@@ -15,23 +15,20 @@
 # 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

Modified: llvm/trunk/tools/gold/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/Makefile?rev=65518&r1=65517&r2=65518&view=diff

==============================================================================
--- llvm/trunk/tools/gold/Makefile (original)
+++ llvm/trunk/tools/gold/Makefile Thu Feb 26 01:56:49 2009
@@ -21,6 +21,7 @@
 DONT_BUILD_RELINKED = 1
 
 LINK_COMPONENTS :=
+LIBS += -llto
 
 include $(LEVEL)/Makefile.common
 

Modified: llvm/trunk/tools/lto/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/Makefile?rev=65518&r1=65517&r2=65518&view=diff

==============================================================================
--- llvm/trunk/tools/lto/Makefile (original)
+++ llvm/trunk/tools/lto/Makefile Thu Feb 26 01:56:49 2009
@@ -16,12 +16,8 @@
 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