diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2005-04-22 17:14:14 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2005-04-22 17:14:14 +0000 |
commit | 5a870448d12a786098e9ec5018cd2bb3f5f673fd (patch) | |
tree | b659443460b52f1f68507b938dbac645ba12e23f | |
parent | 675f0921bbdade1728cc366da2b109378cbb1e53 (diff) | |
download | llvm-5a870448d12a786098e9ec5018cd2bb3f5f673fd.tar.gz llvm-5a870448d12a786098e9ec5018cd2bb3f5f673fd.tar.bz2 llvm-5a870448d12a786098e9ec5018cd2bb3f5f673fd.tar.xz |
Two changes:
1. Get rid of TOOLLINKOPTS as it is a hold over from llvm-test and only
used to communicate additional libraries to the linker. The *standard*
way to do that is with the LIBS variable which this change supports.
2. Allow the TARGETS_TO_BUILD variable to be set from the configuration
substitution. This is the result of the --enable-target= parameter to
the configure script.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21449 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | Makefile.config.in | 8 | ||||
-rw-r--r-- | tools/analyze/Makefile | 2 | ||||
-rw-r--r-- | tools/bugpoint/Makefile | 2 | ||||
-rw-r--r-- | tools/opt/Makefile | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index 5e0eda596b..074bd05cde 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -100,6 +100,9 @@ ARCH=@ARCH@ # Target triple (cpu-vendor-os) for which we should generate code TARGET_TRIPLE=@target@ +# Targets that we should build +TARGETS_TO_BUILD=@TARGETS_TO_BUILD@ + # Endian-ness of the target ENDIAN=@ENDIAN@ @@ -113,9 +116,6 @@ CC := @CC@ # Linker flags. LDFLAGS+=@LDFLAGS@ -# Libraries needed by tools -TOOLLINKOPTS=@LIBS@ - # Path to the library archiver program. AR_PATH = @AR@ @@ -150,6 +150,8 @@ RUNTEST := @RUNTEST@ TCLSH := @TCLSH@ ZIP := @ZIP@ +LIBS := @LIBS@ + # Path to location for LLVM C/C++ front-end. You can modify this if you # want to override the value set by configure. LLVMGCCDIR := @LLVMGCCDIR@ diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile index 19464d7cfd..74a6f4acbf 100644 --- a/tools/analyze/Makefile +++ b/tools/analyze/Makefile @@ -12,6 +12,4 @@ USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis LLVMipa LLVMDataStructure \ LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \ LLVMTransformUtils.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a -TOOLLINKOPTS = $(PLATFORMLIBDL) - include $(LEVEL)/Makefile.common diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile index 052ca29f0d..e5eacd0cb1 100644 --- a/tools/bugpoint/Makefile +++ b/tools/bugpoint/Makefile @@ -18,6 +18,4 @@ USEDLIBS = LLVMipo LLVMScalarOpts LLVMAnalysis $(OPTLIBS) $(ANALIBS) \ LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \ LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a -TOOLLINKOPTS = $(PLATFORMLIBDL) - include $(LEVEL)/Makefile.common diff --git a/tools/opt/Makefile b/tools/opt/Makefile index f7d551e3ee..86e36e2207 100644 --- a/tools/opt/Makefile +++ b/tools/opt/Makefile @@ -14,6 +14,4 @@ USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation LLVMProfilePaths \ LLVMTarget.a LLVMAnalysis LLVMTransformUtils LLVMCore LLVMSupport.a \ LLVMbzip2 LLVMSystem.a -TOOLLINKOPTS = $(PLATFORMLIBDL) - include $(LEVEL)/Makefile.common |