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 ef6102c3a36c1d1f189c3f8ceb8ca2b348e24c13..b5664e4843d1a0058d0009445300f5af9698defd 100644 (file)
--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
@@ -1,68 +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
 
-# Initialize the USEDLIBS so we can add to it
-USEDLIBS :=
-
-# Check for LLVMCBackend  target
-ifneq ($(strip $(filter CBackend,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMCBackend
-endif
-
-ifneq ($(strip $(filter Sparc,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMSparc
-endif
-
-
-#Check for X86 Target
-ifneq ($(strip $(filter X86,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMX86
-endif
-
-#Check for PowerPC Target
-ifneq ($(strip $(filter PowerPC,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMPowerPC
-endif
-
-#Check for Alpha Target
-ifneq ($(strip $(filter Alpha,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMAlpha
-endif
-
-#Check for IA64 Target
-ifneq ($(strip $(filter IA64,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMIA64
-endif
-
-#Check for ARM Target
-ifneq ($(strip $(filter ARM,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMARM
+LINK_LIBS_IN_SHARED = 1
+ifeq ($(OS),Darwin)
+  SHARED_LIBRARY = 1
+  LOADABLE_MODULE = 1
+  DONT_BUILD_RELINKED = 1
+else
+  BUILD_ARCHIVE = 1
 endif
 
-
-USEDLIBS += 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_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter
 
 include $(LEVEL)/Makefile.common