Revert 62987. This is already reverted in mainline.

llvm-svn: 65125

Author: tlattner

llvm/tools/Makefile

@@ -25,7 +25,8 @@ PARALLEL_DIRS := llvm-config  \
 
 include $(LEVEL)/Makefile.config
 
-ifeq ($(ENABLE_PIC),1)
+# only build new lto project on Darwin for now
+ifeq ($(OS),Darwin)
 PARALLEL_DIRS += lto
 endif
 

llvm/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