Attachment #195162 for bug #229348

Lines 4-11 Link Here

(-)gnu/lib/Makefile (-2 / +1 lines)
4		4
5	SUBDIR= csu	5	SUBDIR= csu
6	SUBDIR.${MK_DIALOG}+= libdialog	6	SUBDIR.${MK_DIALOG}+= libdialog
7	SUBDIR.${MK_GCC}+= libgcov libgomp	7	SUBDIR.${MK_GCC}+= libgcov libgomp libssp
8	SUBDIR.${MK_SSP}+= libssp
9	SUBDIR.${MK_TESTS}+= tests	8	SUBDIR.${MK_TESTS}+= tests
10		9
11	.if ${MK_GNU_GREP} != "no" \|\| ${MK_GNU_GREP_COMPAT} != "no" \|\| \	10	.if ${MK_GNU_GREP} != "no" \|\| ${MK_GNU_GREP_COMPAT} != "no" \|\| \

Lines 59-68 Link Here

(-)lib/libc/Makefile (-4 lines)
59	LDFLAGS+= -nodefaultlibs	59	LDFLAGS+= -nodefaultlibs
60	LIBADD+= compiler_rt	60	LIBADD+= compiler_rt
61		61
62	.if ${MK_SSP} != "no"
63	LIBADD+= ssp_nonshared
64	.endif
65
66	# Extras that live in either libc.a or libc_nonshared.a	62	# Extras that live in either libc.a or libc_nonshared.a
67	LIBC_NONSHARED_SRCS=	63	LIBC_NONSHARED_SRCS=
68		64

Lines 33-40 Link Here

(-)lib/libc/tests/Makefile (-4 lines)
33	TESTS_SUBDIRS+= locale	33	TESTS_SUBDIRS+= locale
34	.endif	34	.endif
35		35
36	.if ${MK_SSP} != "no"
37	TESTS_SUBDIRS+= ssp
38	.endif
39
40	.include <bsd.test.mk>	36	.include <bsd.test.mk>

Lines 319-327 Link Here

(-)share/mk/src.libnames.mk (-3 lines)
319	# The libc dependencies are not strictly needed but are defined to make the	319	# The libc dependencies are not strictly needed but are defined to make the
320	# assert happy.	320	# assert happy.
321	_DP_c= compiler_rt	321	_DP_c= compiler_rt
322	.if ${MK_SSP} != "no"
323	_DP_c+= ssp_nonshared
324	.endif
325	_DP_stdthreads= pthread	322	_DP_stdthreads= pthread
326	_DP_tacplus= md	323	_DP_tacplus= md
327	_DP_panel= ncurses	324	_DP_panel= ncurses

Return to bug 229348