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

diff --git a/Makefile.common b/Makefile.common
index c13ca250b0e6e896377c2f088aff075bbd1c2bf6..0197af2226028ea0c170e348e27719623662e243 100644 (file)
--- 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 08e801965e2aca200585d6f168129515b74e149a..d47fe95e8eb138c7644549af31dd4f2f9f462052 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -18,6 +18,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.
 #

diff --git a/Makefile.rules b/Makefile.rules
index c13ca250b0e6e896377c2f088aff075bbd1c2bf6..0197af2226028ea0c170e348e27719623662e243 100644 (file)
--- 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 
 
 #----------------------------------------------------------