summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-12-18 13:55:17 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-12-18 13:55:17 +0000
commitb0081f6365e438f9d18dba1905ca9989451bb14d (patch)
tree2cf1140145f3f933da0b60d8f03c2b42c3357e77
parent3fcf01fc19e450c63ccf23bd3cac6aa9166fc988 (diff)
downloadpw-darwin-b0081f6365e438f9d18dba1905ca9989451bb14d.tar.gz
pw-darwin-b0081f6365e438f9d18dba1905ca9989451bb14d.tar.zst
pw-darwin-b0081f6365e438f9d18dba1905ca9989451bb14d.zip
Revert the libcrypt/libmd stuff back to how it was. This should not have
happened as it was working around problems elsewhere (ie: binutils/ld not doing the right thing according to the ELF design). libcrypt has been adjusted to not need the runtime -lmd. It's still not quite right (ld is supposed to work damnit) but at least it doesn't impact all the users of libcrypt in Marcel's cross-build model.
-rw-r--r--chpass/Makefile4
-rw-r--r--pw/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/chpass/Makefile b/chpass/Makefile
index 7966608..6e26143 100644
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -27,8 +27,8 @@ COPTS+= -DYP -I. -I${.CURDIR}/../../libexec/ypxfr \
#Some people need this, uncomment to activate
#COPTS+= -DRESTRICT_FULLNAME_CHANGE
-DPADD= ${LIBRPCSVC} ${LIBCRYPT} ${LIBMD}
-LDADD+= -lrpcsvc -lcrypt -lmd
+DPADD= ${LIBRPCSVC} ${LIBCRYPT}
+LDADD+= -lrpcsvc -lcrypt
CLEANFILES= ${GENSRCS}
diff --git a/pw/Makefile b/pw/Makefile
index 02c2957..e6c9fa3 100644
--- a/pw/Makefile
+++ b/pw/Makefile
@@ -10,8 +10,8 @@ MAN8= pw.8
#RND= -DUSE_MD5RAND
CFLAGS+= -W -Wall $(CDB) $(RND)
-LDADD= -lcrypt -lmd
-DPADD= ${LIBCRYPT} ${LIBMD}
+LDADD= -lcrypt
+DPADD= ${LIBCRYPT}
BINMODE=0555