[llvm-commits] [llvm] r64309 - in /llvm/branches/Apple/Dib/tools: Makefile lto/Makefile

[Bill Wendling]

Author: void
Date: Wed Feb 11 12:13:05 2009
New Revision: 64309

URL: http://llvm.org/viewvc/llvm-project?rev=64309&view=rev
Log:
Pull r64285 into Dib:

62987 disables LTO build on darwin.
Revert 62987 for now. Nicolas please investigate.


Modified:
    llvm/branches/Apple/Dib/tools/Makefile
    llvm/branches/Apple/Dib/tools/lto/Makefile

Modified: llvm/branches/Apple/Dib/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/tools/Makefile?rev=64309&r1=64308&r2=64309&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/tools/Makefile (original)
+++ llvm/branches/Apple/Dib/tools/Makefile Wed Feb 11 12:13:05 2009
@@ -25,7 +25,8 @@
 
 include $(LEVEL)/Makefile.config
 
-ifeq ($(ENABLE_PIC),1)
+# only build new lto project on Darwin for now
+ifeq ($(OS),Darwin)
 PARALLEL_DIRS += lto
 endif
 

Modified: llvm/branches/Apple/Dib/tools/lto/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/tools/lto/Makefile?rev=64309&r1=64308&r2=64309&view=diff

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