aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2009-02-11 08:44:13 +0000
committerNick Lewycky <nicholas@mxc.ca>2009-02-11 08:44:13 +0000
commit8746cb6dbdf6d776e81337112e76a0f7fcf080cb (patch)
treec4ae7dd1e36fcdcf8ae155e674d99eda45cf1adf
parentfc201f33dd4e18edd9675ed7cd36579ccead6f71 (diff)
downloadexternal_llvm-8746cb6dbdf6d776e81337112e76a0f7fcf080cb.zip
external_llvm-8746cb6dbdf6d776e81337112e76a0f7fcf080cb.tar.gz
external_llvm-8746cb6dbdf6d776e81337112e76a0f7fcf080cb.tar.bz2
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
-rw-r--r--tools/Makefile5
-rw-r--r--tools/lto/Makefile8
2 files changed, 5 insertions, 8 deletions
diff --git a/tools/Makefile b/tools/Makefile
index a296f81..471cdd0 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 69014d7..f0f6da7 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