diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in
index 68b4eb8f1..c571b7255 100644
--- a/appl/kx/Makefile.in
+++ b/appl/kx/Makefile.in
@@ -9,6 +9,7 @@ XINCS = @X_CFLAGS@
 XLIBS = @X_LIBS@ @LIB_XauReadAuth@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -99,10 +100,10 @@ encdata.c:
 	$(LN_S) $(srcdir)/../kauth/encdata.c .
 
 kx$(EXECSUFFIX): $(OBJECTS_KX)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 kxd$(EXECSUFFIX): $(OBJECTS_KXD)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 rxterm: rxterm.in
 	sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxterm.in > $@
diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in
index 6e370939a..164490b99 100644
--- a/appl/otp/Makefile.in
+++ b/appl/otp/Makefile.in
@@ -7,6 +7,7 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -80,10 +81,10 @@ OLIB=-L../../lib/otp -lotp -L../../lib/des -ldes
 LIBROKEN=-L../../lib/roken -lroken
 
 otp$(EXECSUFFIX): $(OBJECTS_OTP)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
 
 otpprint$(EXECSUFFIX): $(OBJECTS_OTPPRINT)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../include/config.h
 
diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in
index 6817e0a99..76f1de6de 100644
--- a/appl/popper/Makefile.in
+++ b/appl/popper/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ../..
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
@@ -102,10 +103,10 @@ LIBROKEN=-L../../lib/roken -lroken
 OTPLIB=@LIB_otp@
 
 popper$(EXECSUFFIX): $(POPPER_OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POPPER_OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
+	$(LINK $(LD_FLAGS) $(LDFLAGS) -o $@ $(POPPER_OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
 
 pop_debug$(EXECSUFFIX): $(POP_DEBUG_OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POP_DEBUG_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POP_DEBUG_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../include/config.h
 
diff --git a/appl/push/Makefile.in b/appl/push/Makefile.in
index 2c95bebd7..a348cb6c4 100644
--- a/appl/push/Makefile.in
+++ b/appl/push/Makefile.in
@@ -7,6 +7,7 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -73,7 +74,7 @@ KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
 LIBROKEN=-L../../lib/roken -lroken
 
 push$(EXECSUFFIX): $(push_OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(push_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(push_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../include/config.h
 
diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in
index 4c5cae1e1..c4ee37221 100644
--- a/appl/telnet/Makefile.in
+++ b/appl/telnet/Makefile.in
@@ -9,6 +9,7 @@ SHELL		= /bin/sh
 @SET_MAKE@
 
 CC = @CC@
+LINK = @LINK@
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in
index 8e8870351..49dae89fd 100644
--- a/appl/telnet/libtelnet/Makefile.in
+++ b/appl/telnet/libtelnet/Makefile.in
@@ -7,6 +7,7 @@ VPATH		= @srcdir@
 SHELL		= /bin/sh
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in
index a104eb918..d1d3218f8 100644
--- a/appl/telnet/telnet/Makefile.in
+++ b/appl/telnet/telnet/Makefile.in
@@ -7,6 +7,7 @@ VPATH		= @srcdir@
 SHELL		= /bin/sh
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
@@ -48,7 +49,7 @@ all: $(PROGS)
 	$(CC) -c $(DEFS) -I../../../include -I.. -I$(srcdir)/.. $(CFLAGS) $(CPPFLAGS) $<
 
 telnet$(EXECSUFFIX): $(OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
 
 install: all
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index b72582e70..50a806173 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -9,6 +9,7 @@ top_builddir		= ../../..
 SHELL		= /bin/sh
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@ -DBINDIR='"$(bindir)"'
@@ -51,7 +52,7 @@ all: $(PROGS)
 	$(CC) -c $(DEFS) -I../../../include -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
 
 telnetd$(EXECSUFFIX): $(OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
 
 install: all
 	$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in
index 55fdac720..d08f3338c 100644
--- a/appl/xnlock/Makefile.in
+++ b/appl/xnlock/Makefile.in
@@ -11,6 +11,7 @@ XINCS = @X_CFLAGS@
 XLIBS = @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
 
 CC = @CC@
+LINK = @LINK@
 RANLIB = @RANLIB@
 DEFS = @DEFS@ -DBINDIR='"$(bindir)"'
 CFLAGS = $(XINCS) @CFLAGS@
@@ -96,7 +97,7 @@ KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
 LIBROKEN=-L../../lib/roken -lroken
 
 xnlock$(EXECSUFFIX): xnlock.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
 
 $(OBJECTS): ../../include/config.h
 
diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in
index 1904faad0..9bedcca47 100644
--- a/lib/auth/afskauthlib/Makefile.in
+++ b/lib/auth/afskauthlib/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 LN_S = @LN_S@
 RANLIB = @RANLIB@
diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in
index 2ec841b30..2476d5d79 100644
--- a/lib/auth/pam/Makefile.in
+++ b/lib/auth/pam/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
@@ -82,6 +83,6 @@ $(OBJECTS): ../../../include/config.h
 $(LIB): $(OBJECTS)
 	rm -f $@
 	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) $(LIB_DEPS)
-#	$(CC) -shared -Wl,-x -o $(LIB) $(OBJECTS)  ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
+#	$(LINK) -shared -Wl,-x -o $(LIB) $(OBJECTS)  ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
 
 .PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in
index 178457652..ac01a5d5c 100644
--- a/lib/auth/sia/Makefile.in
+++ b/lib/auth/sia/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 DEFS = @DEFS@
diff --git a/lib/com_err/Makefile.in b/lib/com_err/Makefile.in
index fce147705..b80cc855c 100644
--- a/lib/com_err/Makefile.in
+++ b/lib/com_err/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 LN_S = @LN_S@
@@ -127,7 +128,7 @@ COBJ = compile_et.o parse.o lex.o
 $(COBJ): parse.h
 
 compile_et$(EXECSUFFIX): $(COBJ)
-	$(CC) $(CFLAGS) -o $@ $(COBJ) -L../roken -lroken
+	$(LINK) $(CFLAGS) -o $@ $(COBJ) -L../roken -lroken
 
 parse.c: parse.h
 parse.h: $(srcdir)/parse.y
diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in
index 657979970..6066a1743 100644
--- a/lib/des/Makefile.in
+++ b/lib/des/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 LN_S = @LN_S@
@@ -138,22 +139,22 @@ rpw.o: rpw.c
 speed.o: speed.c
 
 mdtest$(EXECSUFFIX): mdtest.o $(LIB)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ mdtest.o -L. -ldes
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ mdtest.o -L. -ldes
 
 des_opts$(EXECSUFFIX): des_opts.o set_key.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ des_opts.o set_key.o
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ des_opts.o set_key.o
 
 destest$(EXECSUFFIX): destest.o $(LIB)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ destest.o -L. -ldes
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ destest.o -L. -ldes
 
 des$(EXECSUFFIX): des.o $(LIB)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ des.o -L. -ldes
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ des.o -L. -ldes
 
 rpw$(EXECSUFFIX): rpw.o $(LIB)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ rpw.o -L. -ldes
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ rpw.o -L. -ldes
 
 speed$(EXECSUFFIX): speed.o $(LIB)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ speed.o -L. -ldes
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ speed.o -L. -ldes
 
 $(LIBOBJ): ../../include/config.h
 
diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index dd0017184..20f3dfdbf 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 LN_S = @LN_S@
 RANLIB = @RANLIB@
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index d78885e1e..866aa2656 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 LN_S = @LN_S@
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index 3c0945d22..66e5e4102 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 LN_S = @LN_S@
@@ -97,7 +98,7 @@ realclean: distclean
 	rm -f TAGS $(EXTRA_LIB_SOURCES)
 
 otptest$(EXECSUFFIX): $(OTPTEST_OBJECTS) $(LIB)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OTPTEST_OBJECTS) -L. -lotp -L../des -ldes $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
+	$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OTPTEST_OBJECTS) -L. -lotp -L../des -ldes $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
 
 $(LIBNAME).a: $(LIB_OBJECTS) $(LIBADD)
 	rm -f $@
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index dbd3281a8..9cfb3bfe7 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -8,6 +8,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC	= @CC@
+LINK = @LINK@
 CPP	= @CPP@
 AR	= ar
 RANLIB	= @RANLIB@
@@ -175,7 +176,7 @@ roken.h: make-roken$(EXECSUFFIX)
 	else rm -f roken.h; mv tmp.h roken.h; fi
 
 make-roken$(EXECSUFFIX): make-roken.o
-	$(CC) $(CFLAGS) -o $@ make-roken.o
+	$(LINK) $(CFLAGS) -o $@ make-roken.o
 
 make-roken.c: roken.h.in roken.awk
 	$(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
@@ -186,7 +187,7 @@ print_version.h: make-print-version$(EXESUFFIX)
 	@./make-print-version$(EXESUFFIX) print_version.h
 
 make-print-version$(EXECSUFFIX): make-print-version.o
-	$(CC) $(CFLAGS) -o $@ make-print-version.o
+	$(LINK) $(CFLAGS) -o $@ make-print-version.o
 
 install-roken-h: roken.h
 	@if [ -f ../../include/roken.h ] && cmp -s ../../include/roken.h roken.h ; \
diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in
index b68fbf1d8..776357c3b 100644
--- a/lib/sl/Makefile.in
+++ b/lib/sl/Makefile.in
@@ -10,6 +10,7 @@ VPATH = @srcdir@
 top_builddir=../..
 
 CC = @CC@
+LINK = @LINK@
 AR = ar
 RANLIB = @RANLIB@
 LN_S = @LN_S@
@@ -113,7 +114,7 @@ $(OBJECTS): ../../include/config.h
 $(mk_cmds_OBJECTS): parse.h
 
 mk_cmds$(EXECSUFFIX): $(mk_cmds_OBJECTS)
-	$(CC) $(CFLAGS) -o $@ $(mk_cmds_OBJECTS) -L../roken -lroken
+	$(LINK) $(CFLAGS) -o $@ $(mk_cmds_OBJECTS) -L../roken -lroken
 
 parse.c: parse.h
 parse.h: $(srcdir)/parse.y