From 535e3e8df963e2d8327718518efd9ddc31faf42a Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Wed, 11 Feb 2009 13:23:49 +0000 Subject: [PATCH] Revert r64299: it breaks the build when configured without --enable-pic, like my nightly tester. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64302 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/Makefile | 5 ++--- tools/lto/Makefile | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 471cdd0c2de..a296f818702 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,11 +25,10 @@ PARALLEL_DIRS := llvm-config \ include $(LEVEL)/Makefile.config -# build lto project on Darwin or if PIC is enabled +# only build new lto project on Darwin for now 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 f0f6da7191a..69014d781ff 100644 --- a/tools/lto/Makefile +++ b/tools/lto/Makefile @@ -16,8 +16,12 @@ LIBRARYNAME = LTO include $(LEVEL)/Makefile.config LINK_LIBS_IN_SHARED = 1 -SHARED_LIBRARY = 1 -DONT_BUILD_RELINKED = 1 +ifeq ($(OS),Darwin) + SHARED_LIBRARY = 1 + DONT_BUILD_RELINKED = 1 +else + BUILD_ARCHIVE = 1 +endif LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter -- 2.34.1