Author: sbruno
Date: Sat Nov 15 18:03:38 2014
New Revision: 274552
URL: https://svnweb.freebsd.org/changeset/base/274552

Log:
  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

Modified:
  head/usr.bin/sort/Makefile

Modified: head/usr.bin/sort/Makefile
==============================================================================
--- head/usr.bin/sort/Makefile  Sat Nov 15 14:55:05 2014        (r274551)
+++ head/usr.bin/sort/Makefile  Sat Nov 15 18:03:38 2014        (r274552)
@@ -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
 
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to