summaryrefslogtreecommitdiff
path: root/tools/Makefile
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2009-02-26 07:56:49 +0000
committerNick Lewycky <nicholas@mxc.ca>2009-02-26 07:56:49 +0000
commitdcd158af278ec19be6d608acb4e358d36903c86f (patch)
treedc1243fbb6f48062edb839e1228dc27da57d3a44 /tools/Makefile
parenta15dc035a6d4153bece7a067e037e5d6f5d58b16 (diff)
downloadllvm-dcd158af278ec19be6d608acb4e358d36903c86f.tar.gz
llvm-dcd158af278ec19be6d608acb4e358d36903c86f.tar.bz2
llvm-dcd158af278ec19be6d608acb4e358d36903c86f.tar.xz
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65518 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/Makefile')
-rw-r--r--tools/Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/tools/Makefile b/tools/Makefile
index a296f81870..7305f6bafe 100644
--- a/tools/Makefile
+++ b/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