svn commit: r341489 - head

[Andrew Turner]

Author: andrew
Date: Tue Dec  4 18:51:28 2018
New Revision: 341489
URL: https://svnweb.freebsd.org/changeset/base/341489

Log:
  Only gnu/lib/csu when MK_BSD_CRTBEGIN is off.
  
  We were still building it from Makefile.inc1. Disable it there so we don't
  try to build the GNU crtbegin/crtend when the BSD version was asked for.
  
  PR:		233733
  Reported by:	lwhsu
  Reviewed by:	emaste
  MFC with:	r339738
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D18428

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Dec  4 18:38:32 2018	(r341488)
+++ head/Makefile.inc1	Tue Dec  4 18:51:28 2018	(r341489)
@@ -2689,8 +2689,10 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared
 # gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before
 # all shared libraries for ELF.
 #
-_startup_libs=	gnu/lib/csu
-_startup_libs+=	lib/csu
+_startup_libs=	lib/csu
+.if ${MK_BSD_CRTBEGIN} == "no"
+_startup_libs+=	gnu/lib/csu
+.endif
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
 _startup_libs+=	lib/libc_nonshared