From b347aa1c9a90ebc790baab556275436960ac8754 Mon Sep 17 00:00:00 2001
From: James Carlson <carlsonj@workingcode.com>
Date: Mon, 31 Mar 2003 12:07:28 +0000
Subject: [PATCH] Made path to 'ld' explicit when building kernel modules. 
 This avoids trouble with systems that have GNU ld installed and on the path
 before the normal /usr/ccs/bin/ld that comes with the system.

---
 solaris/Makedefs            | 2 ++
 solaris/Makedefs.gcc        | 2 ++
 solaris/Makefile.sol2       | 8 ++++----
 solaris/Makefile.sol2-64    | 9 +++++----
 solaris/Makefile.sol2gcc    | 8 ++++----
 solaris/Makefile.sol2gcc-64 | 9 +++++----
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/solaris/Makedefs b/solaris/Makedefs
index f5ac9c7..e4619b1 100644
--- a/solaris/Makedefs
+++ b/solaris/Makedefs
@@ -10,3 +10,5 @@ ETCDIR = /etc/ppp
 
 CC = /opt/SUNWspro/bin/cc
 COPTS = -O -Xa
+
+LD = /usr/ccs/bin/ld
diff --git a/solaris/Makedefs.gcc b/solaris/Makedefs.gcc
index e24152f..06b75db 100644
--- a/solaris/Makedefs.gcc
+++ b/solaris/Makedefs.gcc
@@ -10,3 +10,5 @@ ETCDIR = /etc/ppp
 
 CC = gcc
 COPTS = -O2
+
+LD = /usr/ccs/bin/ld
diff --git a/solaris/Makefile.sol2 b/solaris/Makefile.sol2
index b5d8189..b67902b 100644
--- a/solaris/Makefile.sol2
+++ b/solaris/Makefile.sol2
@@ -1,7 +1,7 @@
 #
 # Makefile for STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2,v 1.1 2000/04/18 23:51:27 masputra Exp $
+# $Id: Makefile.sol2,v 1.2 2003/03/31 12:07:28 carlsonj Exp $
 #
 
 include Makedefs.sol2
@@ -14,15 +14,15 @@ COMP_OBJS = ppp_comp.o bsd-comp.o deflate.o zlib.o vjcompress.o \
 all:	ppp ppp_ahdl ppp_comp
 
 ppp:	ppp.o ppp_mod.o
-	ld -r -o $@ ppp.o ppp_mod.o
+	$(LD) -r -o $@ ppp.o ppp_mod.o
 	chmod +x $@
 
 ppp_ahdl: ppp_ahdlc.o ppp_ahdlc_mod.o
-	ld -r -o $@ ppp_ahdlc.o ppp_ahdlc_mod.o
+	$(LD) -r -o $@ ppp_ahdlc.o ppp_ahdlc_mod.o
 	chmod +x $@
 
 ppp_comp: $(COMP_OBJS)
-	ld -r -o $@ $(COMP_OBJS)
+	$(LD) -r -o $@ $(COMP_OBJS)
 	chmod +x $@
 
 bsd-comp.o:	../modules/bsd-comp.c
diff --git a/solaris/Makefile.sol2-64 b/solaris/Makefile.sol2-64
index b57f885..1e94890 100644
--- a/solaris/Makefile.sol2-64
+++ b/solaris/Makefile.sol2-64
@@ -1,7 +1,7 @@
 #
 # Makefile for 64-bit STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2-64,v 1.1 2000/04/18 23:51:27 masputra Exp $
+# $Id: Makefile.sol2-64,v 1.2 2003/03/31 12:07:28 carlsonj Exp $
 #
 
 include Makedefs.sol2
@@ -25,15 +25,16 @@ std_objs:
 	$(MAKE) -f $(STD_MAKE) all
 
 ppp:	$(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
-	ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
+	$(LD) -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
 	chmod +x $(LP64DIR)/$@
 
 ppp_ahdl: $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
-	ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
+	$(LD) -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp_ahdlc.o \
+		$(LP64DIR)/ppp_ahdlc_mod.o
 	chmod +x $(LP64DIR)/$@
 
 ppp_comp: $(COMP_OBJS)
-	ld -r -o $(LP64DIR)/$@ $(COMP_OBJS)
+	$(LD) -r -o $(LP64DIR)/$@ $(COMP_OBJS)
 	chmod +x $(LP64DIR)/$@
 
 $(LP64DIR)/bsd-comp.o: ../modules/bsd-comp.c
diff --git a/solaris/Makefile.sol2gcc b/solaris/Makefile.sol2gcc
index 0eb97ad..04a24c5 100644
--- a/solaris/Makefile.sol2gcc
+++ b/solaris/Makefile.sol2gcc
@@ -1,7 +1,7 @@
 #
 # Makefile for STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2gcc,v 1.1 2002/09/07 05:15:25 carlsonj Exp $
+# $Id: Makefile.sol2gcc,v 1.2 2003/03/31 12:07:28 carlsonj Exp $
 #
 
 include Makedefs.sol2
@@ -12,15 +12,15 @@ COMP_OBJS = ppp_comp.o bsd-comp.o deflate.o zlib.o vjcompress.o \
 all:	ppp ppp_ahdl ppp_comp
 
 ppp:	ppp.o ppp_mod.o
-	ld -r -o $@ ppp.o ppp_mod.o
+	$(LD) -r -o $@ ppp.o ppp_mod.o
 	chmod +x $@
 
 ppp_ahdl: ppp_ahdlc.o ppp_ahdlc_mod.o
-	ld -r -o $@ ppp_ahdlc.o ppp_ahdlc_mod.o
+	$(LD) -r -o $@ ppp_ahdlc.o ppp_ahdlc_mod.o
 	chmod +x $@
 
 ppp_comp: $(COMP_OBJS)
-	ld -r -o $@ $(COMP_OBJS)
+	$(LD) -r -o $@ $(COMP_OBJS)
 	chmod +x $@
 
 bsd-comp.o:	../modules/bsd-comp.c
diff --git a/solaris/Makefile.sol2gcc-64 b/solaris/Makefile.sol2gcc-64
index f826f1a..af9ada5 100644
--- a/solaris/Makefile.sol2gcc-64
+++ b/solaris/Makefile.sol2gcc-64
@@ -1,7 +1,7 @@
 #
 # Makefile for 64-bit STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2gcc-64,v 1.1 2002/09/07 05:15:25 carlsonj Exp $
+# $Id: Makefile.sol2gcc-64,v 1.2 2003/03/31 12:07:28 carlsonj Exp $
 #
 
 include Makedefs.sol2
@@ -25,15 +25,16 @@ std_objs:
 	$(MAKE) -f $(STD_MAKE) all
 
 ppp:	$(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
-	ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
+	$(LD) -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
 	chmod +x $(LP64DIR)/$@
 
 ppp_ahdl: $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
-	ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
+	$(LD) -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp_ahdlc.o \
+		$(LP64DIR)/ppp_ahdlc_mod.o
 	chmod +x $(LP64DIR)/$@
 
 ppp_comp: $(COMP_OBJS)
-	ld -r -o $(LP64DIR)/$@ $(COMP_OBJS)
+	$(LD) -r -o $(LP64DIR)/$@ $(COMP_OBJS)
 	chmod +x $(LP64DIR)/$@
 
 $(LP64DIR)/bsd-comp.o: ../modules/bsd-comp.c
-- 
2.39.2