Try this. Darwin -> LTO, PIC -> LTO + possibly gold too.

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

diff --git a/tools/Makefile b/tools/Makefile
index a296f8187024aabd6a6da33f959a0db91e7ff946..471cdd0c2de90af28fc3e821df26ca912b1a9a9d 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -25,10 +25,11 @@ PARALLEL_DIRS := llvm-config  \
 
 include $(LEVEL)/Makefile.config
 
-# only build new lto project on Darwin for now
+# build lto project on Darwin or if PIC is enabled
 ifeq ($(OS),Darwin)
 PARALLEL_DIRS += lto
-
+else ($(ENABLE_PIC),1)
+PARALLEL_DIRS += lto
 ifdef BINUTILS_INCDIR
 PARALLEL_DIRS += gold
 endif

diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index 69014d781ff1e7bea233a23da98f796d5aa49b83..f0f6da7191a258c39f045e84543d48a1472792ba 100644 (file)
--- a/tools/lto/Makefile
+++ b/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