[llvm-commits] [llvm] r64299 - in /llvm/trunk/tools: Makefile lto/Makefile

Nick Lewycky nicholas at mxc.ca
Wed Feb 11 00:44:13 PST 2009


Author: nicholas
Date: Wed Feb 11 02:44:13 2009
New Revision: 64299

URL: http://llvm.org/viewvc/llvm-project?rev=64299&view=rev
Log:
Try this. Darwin -> LTO, PIC -> LTO + possibly gold too.

Modified:
    llvm/trunk/tools/Makefile
    llvm/trunk/tools/lto/Makefile

Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=64299&r1=64298&r2=64299&view=diff

==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Wed Feb 11 02:44:13 2009
@@ -25,10 +25,11 @@
 
 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

Modified: llvm/trunk/tools/lto/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/Makefile?rev=64299&r1=64298&r2=64299&view=diff

==============================================================================
--- llvm/trunk/tools/lto/Makefile (original)
+++ llvm/trunk/tools/lto/Makefile Wed Feb 11 02:44:13 2009
@@ -16,12 +16,8 @@
 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
 





More information about the llvm-commits mailing list