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 | 794fcd2ef8b8155faab218584ca46801d75c0161 (patch) | |
| tree | f77ddc83df0d03dd4f42ecdd000fd73d0587ae81 | |
| parent | 6074d2f37abaaa2957b4575d36fd9cd87d8ee08f (diff) | |
| download | llvm-794fcd2ef8b8155faab218584ca46801d75c0161.tar.gz llvm-794fcd2ef8b8155faab218584ca46801d75c0161.tar.bz2 llvm-794fcd2ef8b8155faab218584ca46801d75c0161.tar.xz | |
Added configurable options for the Linker and Archiver.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6432 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | Makefile.config | 10 | ||||
| -rw-r--r-- | Makefile.rules | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index c13ca250b0..0197af2226 100644 --- a/Makefile.common +++ b/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/Makefile.config b/Makefile.config index 08e801965e..d47fe95e8e 100644 --- a/Makefile.config +++ b/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/Makefile.rules b/Makefile.rules index c13ca250b0..0197af2226 100644 --- a/Makefile.rules +++ b/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 #---------------------------------------------------------- |