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

diff --git a/Makefile.config.in b/Makefile.config.in
index 5e0eda596bf4b5a007fc7b65de3d9e97efecac51..074bd05cdebf52c05b426223b344437f5b5d1294 100644 (file)
--- 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 19464d7cfd23b2d05f49c309213162626abbcffc..74a6f4acbf2342ff5f9c1f27e98e481a4c55541f 100644 (file)
--- 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 052ca29f0de3bff2452851118d9e16858ba36e4e..e5eacd0cb1b31a6dca3bd9f88c002f4340330baf 100644 (file)
--- 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 f7d551e3ee013d4815c19bc6de42e6f9dc06c50a..86e36e22073988f57e72113baa01c2ae3aa38259 100644 (file)
--- 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