Fix PR2369 by making scalarrepl more careful about promoting

[oota-llvm.git] / tools / lto / Makefile

diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index 40ed6b167e8cf28e42abade250c477179f1a850c..b5664e4843d1a0058d0009445300f5af9698defd 100644 (file)
--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
@@ -1,30 +1,30 @@
-##===- tools/lto/Makefile -----------------------------------*- Makefile -*-===##
+##===- tools/lto/Makefile ----------------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by Devang Patel and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
 LIBRARYNAME = LLVMlto
 
-LINK_LIBS_IN_SHARED = 1
-SHARED_LIBRARY = 1
-LOADABLE_MODULE = 1
-DONT_BUILD_RELINKED = 1
-
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
-# early so we can set up USEDLIBS properly before includeing Makefile.rules
+# early so we can set up LINK_COMPONENTS before includeing Makefile.rules
 include $(LEVEL)/Makefile.config
 
-USEDLIBS := $(addprefix LLVM,$(TARGETS_TO_BUILD)) \
-       LLVMSelectionDAG.a LLVMCodeGen.a LLVMipo.a LLVMTransforms.a \
-       LLVMScalarOpts.a LLVMipa.a LLVMTransformUtils.a LLVMAnalysis.a \
-       LLVMTarget.a LLVMBCReader.a LLVMBCWriter.a LLVMSystem.a LLVMLinker.a \
-       LLVMCore.a LLVMSupport.a LLVMbzip2.a
+LINK_LIBS_IN_SHARED = 1
+ifeq ($(OS),Darwin)
+  SHARED_LIBRARY = 1
+  LOADABLE_MODULE = 1
+  DONT_BUILD_RELINKED = 1
+else
+  BUILD_ARCHIVE = 1
+endif
+
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter
 
 include $(LEVEL)/Makefile.common