aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1998-05-28 13:20:35 +0000
committerPeter Wemm <peter@FreeBSD.org>1998-05-28 13:20:35 +0000
commit215c9a37c51fd4095998d03b8989bb9f6956c69b (patch)
tree66a2ea5e5d34797c65f90d1e99e1292640602b4d /Makefile
parentc4a04f5540daba8f5f6458f42f9bbd9dc8d427c4 (diff)
Notes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0badf77250196..2c86a9fed112c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.185 1998/05/27 18:50:01 peter Exp $
+# $Id: Makefile,v 1.186 1998/05/28 12:31:42 peter Exp $
#
# While porting to the another architecture include the bootstrap instead
# of the normal build.
@@ -632,9 +632,12 @@ _csu=lib/csu/${MACHINE}.pcc
_csu=lib/csu/${MACHINE}
.endif
-_libcrypt= lib/libcrypt
+# Build the "default" libcrypt first since it sets symlinks for static
+# binaries such as /sbin/init. lib/Makefile builds the other if needed.
.if !defined(NOSECURE) && !defined(NOCRYPT)
-_libcrypt+= secure/lib/libcrypt
+_libcrypt= secure/lib/libcrypt
+.else
+_libcrypt= lib/libcrypt
.endif
.if defined(WANT_CSRG_LIBM)
@@ -661,7 +664,7 @@ _libm= lib/msun
bootstrap-libraries:
.for _lib in ${_csu} gnu/usr.bin/cc/libgcc lib/libtermcap \
gnu/lib/libregex gnu/lib/libreadline lib/libc \
- lib/libcrypt lib/libcurses lib/libedit ${_libm} \
+ ${_libcrypt} lib/libcurses lib/libedit ${_libm} \
lib/libmd lib/libutil lib/libz usr.bin/lex/lib
.if exists(${.CURDIR}/${_lib})
cd ${.CURDIR}/${_lib}; \