diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2019-09-16 14:42:14 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2019-09-16 14:42:14 +0000 |
| commit | 68762cd7f86673b9842f1b7cb9d1ad5904e8ffa9 (patch) | |
| tree | 83ab49263475d16901282e8978830f172b4eee43 /Makefile.inc1 | |
| parent | f48e70930b588d3e00d498e3a2666955cca89c40 (diff) | |
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
Notes
Notes:
svn path=/stable/12/; revision=352400
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 3f563d807b4d..669bcb40b6f9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |