diff options
| author | sbruno <sbruno@FreeBSD.org> | 2014-11-15 18:03:38 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2014-11-15 18:03:38 +0000 |
| commit | 85036d1f0b3f9b0b390e5707b78461fd4d259ee2 (patch) | |
| tree | f2303ed8c16ca661269dd2997f2a7417b25d7b8a /usr.bin | |
| parent | 3eed72cbb75753f44c181136c0e2a591ebf46590 (diff) | |
| download | FreeBSD-src-85036d1f0b3f9b0b390e5707b78461fd4d259ee2.zip FreeBSD-src-85036d1f0b3f9b0b390e5707b78461fd4d259ee2.tar.gz | |
Change LDFLAGS to LDADD in order to allow static builds. This is more
proper way to ensure that the command line compile works the way we intend.
Add explicity DPADD statemens on LIBMD and LIBPTHREAD depending on which
options are used in the build.
Reviewed by: andrew
MFC after: 2 weeks
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/sort/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile index c6eef85..532e930 100644 --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -13,10 +13,12 @@ CLEANFILES+= sort.1 .if ${MK_SORT_THREADS} != "no" CFLAGS+= -DSORT_THREADS -LDFLAGS+= -lpthread -lmd +LDADD= -lpthread -lmd +DPADD= ${LIBPTHREAD} ${LIBMD} MAN_SUB+= -e 's|%%THREADS%%||g' .else -LDFLAGS+= -lmd +LDADD= -lmd +DPADD= ${LIBMD} MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g' .endif |
