diff options
| author | John Criswell <criswell@uiuc.edu> | 2003-05-30 15:50:31 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2003-05-30 15:50:31 +0000 |
| commit | 857ec1891090827a641b1a120871896411c14b77 (patch) | |
| tree | 11135674d618153670b72bb70c932e2603316a44 | |
| parent | 71e56e278c88c108f96917f3dbd93c8f3a067327 (diff) | |
| download | bcm5719-llvm-857ec1891090827a641b1a120871896411c14b77.tar.gz bcm5719-llvm-857ec1891090827a641b1a120871896411c14b77.zip | |
Added configurable options for the Linker and Archiver.
llvm-svn: 6432
| -rw-r--r-- | llvm/Makefile.common | 4 | ||||
| -rw-r--r-- | llvm/Makefile.config | 10 | ||||
| -rw-r--r-- | llvm/Makefile.rules | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/llvm/Makefile.common b/llvm/Makefile.common index c13ca250b0e..0197af22260 100644 --- a/llvm/Makefile.common +++ b/llvm/Makefile.common @@ -234,7 +234,7 @@ endif # Create one .o file from a bunch of .o files... -Relink = ld -r +Relink = ${LD} -r # MakeSO - Create a .so file from a .o files... MakeSO := $(CXX) $(MakeSharedObjectOption) @@ -246,7 +246,7 @@ Depend := $(CXX) -MM -I$(LEVEL)/include -I$(PROJ_INCLUDE) $(CPPFLAGS) DependC := $(CC) -MM -I$(LEVEL)/include -I$(PROJ_INCLUDE) $(CPPFLAGS) # Archive a bunch of .o files into a .a file... -AR = ar cq +AR = ${AR_PATH} cq #---------------------------------------------------------- diff --git a/llvm/Makefile.config b/llvm/Makefile.config index 08e801965e2..d47fe95e8eb 100644 --- a/llvm/Makefile.config +++ b/llvm/Makefile.config @@ -19,6 +19,16 @@ CXX = PATH=/usr/bin /usr/dcs/software/evaluation/bin/g++ CC := PATH=/usr/bin /usr/dcs/software/evaluation/bin/gcc # +# Path to the linker. +# +LD = ld + +# +# Path to the archiver program. +# +AR_PATH = ar + +# # The pathnames of the Flex and Bison programs, respectively. # BISON = bison diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index c13ca250b0e..0197af22260 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -234,7 +234,7 @@ endif # Create one .o file from a bunch of .o files... -Relink = ld -r +Relink = ${LD} -r # MakeSO - Create a .so file from a .o files... MakeSO := $(CXX) $(MakeSharedObjectOption) @@ -246,7 +246,7 @@ Depend := $(CXX) -MM -I$(LEVEL)/include -I$(PROJ_INCLUDE) $(CPPFLAGS) DependC := $(CC) -MM -I$(LEVEL)/include -I$(PROJ_INCLUDE) $(CPPFLAGS) # Archive a bunch of .o files into a .a file... -AR = ar cq +AR = ${AR_PATH} cq #---------------------------------------------------------- |
