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.

diff --git a/solaris/Makedefs b/solaris/Makedefs
index f5ac9c7bde0b4d59a7371a9590707fe5fed4c39f..e4619b131e6ef2371bec48af05d14beee317882e 100644 (file)
--- a/solaris/Makedefs
+++ b/solaris/Makedefs
@@ -10,3 +10,5 @@ ETCDIR = /etc/ppp
 
 CC = /opt/SUNWspro/bin/cc
 COPTS = -O -Xa
 
 CC = /opt/SUNWspro/bin/cc
 COPTS = -O -Xa

+
+LD = /usr/ccs/bin/ld

diff --git a/solaris/Makedefs.gcc b/solaris/Makedefs.gcc
index e24152f9a36f71a87dd2edfcf9378b965895aaff..06b75db492e189d52b7ff63ca029efbd419c765b 100644 (file)
--- a/solaris/Makedefs.gcc
+++ b/solaris/Makedefs.gcc
@@ -10,3 +10,5 @@ ETCDIR = /etc/ppp
 
 CC = gcc
 COPTS = -O2
 
 CC = gcc
 COPTS = -O2

+
+LD = /usr/ccs/bin/ld

diff --git a/solaris/Makefile.sol2 b/solaris/Makefile.sol2
index b5d8189846e3ff54dafd336c40192b693b72a2e9..b67902b25d35194a58b5a7461260f5cc26cd876a 100644 (file)
--- a/solaris/Makefile.sol2
+++ b/solaris/Makefile.sol2
@@ -1,7 +1,7 @@
 #
 # Makefile for STREAMS modules for Solaris 2.
 #
 #
 # 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
 #
 
 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
 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
        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)
        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
        chmod +x $@
 
 bsd-comp.o:    ../modules/bsd-comp.c

diff --git a/solaris/Makefile.sol2-64 b/solaris/Makefile.sol2-64
index b57f885c2376a7df0ad0c349d0020a6f6117507a..1e94890c9dd2c71d62dbd070616066b04fccc69d 100644 (file)
--- a/solaris/Makefile.sol2-64
+++ b/solaris/Makefile.sol2-64
@@ -1,7 +1,7 @@
 #
 # Makefile for 64-bit STREAMS modules for Solaris 2.
 #
 #
 # 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
 #
 
 include Makedefs.sol2


@@ -25,15 +25,16 @@ std_objs:
        $(MAKE) -f $(STD_MAKE) all
 
 ppp:   $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
        $(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
        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)
        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
        chmod +x $(LP64DIR)/$@
 
 $(LP64DIR)/bsd-comp.o: ../modules/bsd-comp.c

diff --git a/solaris/Makefile.sol2gcc b/solaris/Makefile.sol2gcc
index 0eb97adbd52651d467f4478f7dfd4a2b179fd059..04a24c5a0f3b075c1eb7316c28fe4880c6373f8a 100644 (file)
--- a/solaris/Makefile.sol2gcc
+++ b/solaris/Makefile.sol2gcc
@@ -1,7 +1,7 @@
 #
 # Makefile for STREAMS modules for Solaris 2.
 #
 #
 # 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
 #
 
 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
 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
        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)
        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
        chmod +x $@
 
 bsd-comp.o:    ../modules/bsd-comp.c

diff --git a/solaris/Makefile.sol2gcc-64 b/solaris/Makefile.sol2gcc-64
index f826f1aff3350f56741a2dfc44f103b607b04c05..af9ada525902d938bee476498653174dcc11c865 100644 (file)
--- a/solaris/Makefile.sol2gcc-64
+++ b/solaris/Makefile.sol2gcc-64
@@ -1,7 +1,7 @@
 #
 # Makefile for 64-bit STREAMS modules for Solaris 2.
 #
 #
 # 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
 #
 
 include Makedefs.sol2


@@ -25,15 +25,16 @@ std_objs:
        $(MAKE) -f $(STD_MAKE) all
 
 ppp:   $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
        $(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
        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)
        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
        chmod +x $(LP64DIR)/$@
 
 $(LP64DIR)/bsd-comp.o: ../modules/bsd-comp.c