From 51a6b2cbda12486ad6edf7e693ff33db8d498b3e Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Wed, 23 Sep 1998 06:11:35 +0000
Subject: [PATCH] Complete the Perl NOSHARED repair. I had not ensured that the
 shared library was constructed early enough, so perl was linking against the
 static lib. This was breaking perl under ELF, as perl could not load shared
 objects (in fact would dump core).

---
 Makefile.inc1 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 62d2f6395c0..34b6002f0fd 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.17 1998/09/17 16:32:00 andreas Exp $
+#	$Id: Makefile.inc1,v 1.18 1998/09/21 08:55:50 jb Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -668,6 +668,10 @@ _libm=	lib/libm
 _libm=	lib/msun
 .endif
 
+.if !defined(NOPERL)
+_libperl=		gnu/usr.bin/perl/libperl
+.endif
+
 #
 # bootstrap-libraries - build just enough libraries for the bootstrap
 # tools, and install them under ${WORLDTMP}.
@@ -688,7 +692,7 @@ bootstrap-libraries:
     gnu/lib/libregex gnu/lib/libreadline lib/libc \
     ${_libcrypt} lib/libcurses lib/libedit ${_libm} \
     lib/libmd lib/libutil lib/libz usr.bin/lex/lib \
-    gnu/usr.bin/perl/libperl
+    ${_libperl}
 .if exists(${.CURDIR}/${_lib})
 	cd ${.CURDIR}/${_lib}; \
 		${MAKE} ${MK_FLAGS} ${_DEPEND}; \
@@ -707,7 +711,8 @@ bootstrap-libraries:
 libraries:
 .for _lib in lib/libcom_err ${_libcrypt} ${_libm} lib/libmytinfo \
     lib/libncurses lib/libtermcap \
-    gnu/lib gnu/usr.bin/cc/libgcc lib usr.bin/lex/lib usr.sbin/pcvt/keycap
+    gnu/lib gnu/usr.bin/cc/libgcc ${_libperl} lib usr.bin/lex/lib \
+    usr.sbin/pcvt/keycap
 .if exists(${.CURDIR}/${_lib})
 	cd ${.CURDIR}/${_lib}; ${MAKE} all; ${MAKE} -B install
 .endif