Use LINK_COMPONENTS to specify *components* to link against instead of

using USED_LIBS to specify *libraries* to link against.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30090 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-09-04 05:59:09 +00:00
parent 54eae9e1ec
commit aea932d27f
18 changed files with 21 additions and 64 deletions

View File

@ -10,13 +10,8 @@ LEVEL = ../..
TOOLNAME = bugpoint
OPTLIBS = LLVMTransforms.a LLVMInstrumentation.a
ANALIBS = LLVMDataStructure LLVMipa.a LLVMTarget.a
USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
LLVMTransformUtils.a \
LLVMAsmParser.a LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS := bcreader bcwriter asmparser instrumentation scalaropts ipo \
datastructure transforms linker
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,9 +9,7 @@
LEVEL = ../..
TOOLNAME = gccas
USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a LLVMipa.a \
LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = asmparser bcwriter scalaropts ipo ipa transforms
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -10,10 +10,7 @@
LEVEL = ../..
TOOLNAME = gccld
USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = bcreader bcwriter ipo scalaropts ipa linker
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -13,24 +13,10 @@ REQUIRES_EH := 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 including Makefile.rules
include $(LEVEL)/Makefile.config
USEDLIBS := $(addprefix LLVM,$(TARGETS_TO_BUILD)) \
LLVMTarget.a \
LLVMCodeGen.a \
LLVMSelectionDAG.a \
LLVMipa.a \
LLVMTransforms.a \
LLVMScalarOpts.a \
LLVMTransformUtils.a \
LLVMAnalysis.a \
LLVMBCReader.a \
LLVMBCWriter.a \
LLVMCore.a \
LLVMSupport.a \
LLVMbzip2.a \
LLVMSystem.a
LINK_COMPONENTS := $(TARGETS_TO_BUILD) bcreader
include $(LLVM_SRC_ROOT)/Makefile.rules

View File

@ -9,8 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-ar
USEDLIBS = LLVMArchive.a LLVMBCReader.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = archive bcreader
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,7 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-bcanalyzer
USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS := bcreader
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,8 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-db
USEDLIBS = LLVMDebugger.a LLVMBCReader.a LLVMCore.a LLVMSupport.a \
LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS := debugger bcreader
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,9 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-extract
USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a \
LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS := bcreader bcwriter ipo
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -10,10 +10,7 @@
LEVEL = ../..
TOOLNAME = llvm-ld
USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = ipo scalaropts linker archive bcreader bcwriter
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,8 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-link
USEDLIBS = LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = linker bcreader bcwriter
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,8 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-nm
USEDLIBS = LLVMArchive.a LLVMBCReader.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = archive bcreader
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,8 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-prof
USEDLIBS = LLVMAnalysis.a LLVMBCReader.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = bcreader analysis
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -9,8 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-ranlib
USEDLIBS = LLVMArchive.a LLVMBCReader.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = archive bcreader
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common

View File

@ -8,10 +8,9 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
TOOLNAME = llvm2cpp
USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS = bcreader
REQUIRES_EH := 1
include $(LEVEL)/Makefile.common
CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
TOOLNAME = llvmc
USEDLIBS = LLVMCore.a LLVMSupport.a LLVMSystem.a
LINK_COMPONENTS = support system
CONFIG_FILES = c cpp ll
EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs
REQUIRES_EH := 1

View File

@ -295,7 +295,6 @@ int main(int argc, char **argv) {
if (KeepTemps) flags |= CompilerDriver::KEEP_TEMPS_FLAG;
if (ShowStats) flags |= CompilerDriver::SHOW_STATS_FLAG;
if (TimeActions) flags |= CompilerDriver::TIME_ACTIONS_FLAG;
if (TimePassesIsEnabled) flags |= CompilerDriver::TIME_PASSES_FLAG;
if (StripOutput) flags |= CompilerDriver::STRIP_OUTPUT_FLAG;
CD->setDriverFlags(flags);

View File

@ -17,14 +17,10 @@ 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_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts bcreader bcwriter
include $(LEVEL)/Makefile.common

View File

@ -10,9 +10,7 @@ LEVEL = ../..
TOOLNAME = opt
REQUIRES_EH := 1
USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMInstrumentation.a \
LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure \
LLVMTransforms.a LLVMTarget.a LLVMTransformUtils.a LLVMAnalysis.a \
LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
LINK_COMPONENTS := bcreader bcwriter instrumentation scalaropts ipo \
datastructure transforms
include $(LEVEL)/Makefile.common