svn commit: r296399 - head

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar  4 22:37:16 2016
New Revision: 296399
URL: https://svnweb.freebsd.org/changeset/base/296399

Log:
  Don't add duplicates from LOCAL_LIB_DIRS.
  
  This causes parallel failures.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Mar  4 22:37:09 2016	(r296398)
+++ head/Makefile.inc1	Fri Mar  4 22:37:16 2016	(r296399)
@@ -1935,7 +1935,7 @@ lib/liblzma__L: lib/libthr__L
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
-.if exists(${.CURDIR}/${_DIR}/Makefile)
+.if exists(${.CURDIR}/${_DIR}/Makefile) && empty(_generic_libs:M${_DIR})
 _generic_libs+= ${_DIR}
 .endif
 .endfor