mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-02-06 12:16:59 +00:00
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. llvm-svn: 21449
This commit is contained in:
parent
85a9424fa6
commit
8e5135f359
@ -100,6 +100,9 @@ ARCH=@ARCH@
|
|||||||
# Target triple (cpu-vendor-os) for which we should generate code
|
# Target triple (cpu-vendor-os) for which we should generate code
|
||||||
TARGET_TRIPLE=@target@
|
TARGET_TRIPLE=@target@
|
||||||
|
|
||||||
|
# Targets that we should build
|
||||||
|
TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
|
||||||
|
|
||||||
# Endian-ness of the target
|
# Endian-ness of the target
|
||||||
ENDIAN=@ENDIAN@
|
ENDIAN=@ENDIAN@
|
||||||
|
|
||||||
@ -113,9 +116,6 @@ CC := @CC@
|
|||||||
# Linker flags.
|
# Linker flags.
|
||||||
LDFLAGS+=@LDFLAGS@
|
LDFLAGS+=@LDFLAGS@
|
||||||
|
|
||||||
# Libraries needed by tools
|
|
||||||
TOOLLINKOPTS=@LIBS@
|
|
||||||
|
|
||||||
# Path to the library archiver program.
|
# Path to the library archiver program.
|
||||||
AR_PATH = @AR@
|
AR_PATH = @AR@
|
||||||
|
|
||||||
@ -150,6 +150,8 @@ RUNTEST := @RUNTEST@
|
|||||||
TCLSH := @TCLSH@
|
TCLSH := @TCLSH@
|
||||||
ZIP := @ZIP@
|
ZIP := @ZIP@
|
||||||
|
|
||||||
|
LIBS := @LIBS@
|
||||||
|
|
||||||
# Path to location for LLVM C/C++ front-end. You can modify this if you
|
# Path to location for LLVM C/C++ front-end. You can modify this if you
|
||||||
# want to override the value set by configure.
|
# want to override the value set by configure.
|
||||||
LLVMGCCDIR := @LLVMGCCDIR@
|
LLVMGCCDIR := @LLVMGCCDIR@
|
||||||
|
@ -12,6 +12,4 @@ USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis LLVMipa LLVMDataStructure \
|
|||||||
LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \
|
LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \
|
||||||
LLVMTransformUtils.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
|
LLVMTransformUtils.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
|
||||||
|
|
||||||
TOOLLINKOPTS = $(PLATFORMLIBDL)
|
|
||||||
|
|
||||||
include $(LEVEL)/Makefile.common
|
include $(LEVEL)/Makefile.common
|
||||||
|
@ -18,6 +18,4 @@ USEDLIBS = LLVMipo LLVMScalarOpts LLVMAnalysis $(OPTLIBS) $(ANALIBS) \
|
|||||||
LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
|
LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
|
||||||
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
|
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
|
||||||
|
|
||||||
TOOLLINKOPTS = $(PLATFORMLIBDL)
|
|
||||||
|
|
||||||
include $(LEVEL)/Makefile.common
|
include $(LEVEL)/Makefile.common
|
||||||
|
@ -14,6 +14,4 @@ USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation LLVMProfilePaths \
|
|||||||
LLVMTarget.a LLVMAnalysis LLVMTransformUtils LLVMCore LLVMSupport.a \
|
LLVMTarget.a LLVMAnalysis LLVMTransformUtils LLVMCore LLVMSupport.a \
|
||||||
LLVMbzip2 LLVMSystem.a
|
LLVMbzip2 LLVMSystem.a
|
||||||
|
|
||||||
TOOLLINKOPTS = $(PLATFORMLIBDL)
|
|
||||||
|
|
||||||
include $(LEVEL)/Makefile.common
|
include $(LEVEL)/Makefile.common
|
||||||
|
Loading…
x
Reference in New Issue
Block a user