From 46dec953194a2b3c308ec94c19961aa822b9d402 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Wed, 11 Feb 2009 08:44:13 +0000 Subject: [PATCH] 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 --- tools/Makefile | 5 +++-- tools/lto/Makefile | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index a296f818702..471cdd0c2de 100644 --- 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 69014d781ff..f0f6da7191a 100644 --- 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 -- 2.34.1