svn commit: r352400 - stable/12

[Andrew Turner]

Author: andrew
Date: Mon Sep 16 14:42:14 2019
New Revision: 352400
URL: https://svnweb.freebsd.org/changeset/base/352400

Log:
  MFC r341489:
  
  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:
  stable/12/Makefile.inc1
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1	Mon Sep 16 14:35:02 2019	(r352399)
+++ stable/12/Makefile.inc1	Mon Sep 16 14:42:14 2019	(r352400)
@@ -2514,8 +2514,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