diff options
| author | Warner Losh <imp@FreeBSD.org> | 2014-06-06 04:09:07 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2014-06-06 04:09:07 +0000 |
| commit | 04efeffe998b4365aa6eec18b83ab3d436901fdc (patch) | |
| tree | 59c8f747159b3db5af5ad9aa0b3246c6c9382ff5 /bin/ed | |
| parent | 3f1afabf0948cbbc44767db711be353e523f396d (diff) | |
| download | src-test-04efeffe998b4365aa6eec18b83ab3d436901fdc.tar.gz src-test-04efeffe998b4365aa6eec18b83ab3d436901fdc.zip | |
When building picobsd, define WITHOUT_OPENSSL and WITHOUT_KERBEROS and
remove the now-redundant checks for RELEASE_CRUNCH. This originally
was defined for building smaller sysinstall images, but was later also
used by picobsd builds for a similar purpose. Now that we've moved
away from sysinstall, picobsd is the only remaining consumer of this
interface. Adding these two options reduces the RELEASE_CRUNCH
special cases in the tree by half.
Notes
Notes:
svn path=/head/; revision=267147
Diffstat (limited to 'bin/ed')
| -rw-r--r-- | bin/ed/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/ed/Makefile b/bin/ed/Makefile index fb1c37da3d01b..cc47a4271e924 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -7,9 +7,7 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if !defined(RELEASE_CRUNCH) && \ - ${MK_OPENSSL} != "no" && \ - ${MK_ED_CRYPTO} != "no" +.if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES DPADD= ${LIBCRYPTO} LDADD= -lcrypto |