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

[Duncan Sands]

Author: baldrick
Date: Wed Feb 11 07:23:49 2009
New Revision: 64302

URL: http://llvm.org/viewvc/llvm-project?rev=64302&view=rev
Log:
Revert r64299: it breaks the build when configured
without --enable-pic, like my nightly tester.

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=64302&r1=64301&r2=64302&view=diff

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

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

==============================================================================
--- llvm/trunk/tools/lto/Makefile (original)
+++ llvm/trunk/tools/lto/Makefile Wed Feb 11 07:23:49 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