[Midnightbsd-cvs] src [9721] trunk/lib/libc/Makefile: ssp is configurable

[laffer1 at midnightbsd.org]

Revision: 9721
          http://svnweb.midnightbsd.org/src/?rev=9721
Author:   laffer1
Date:     2017-12-22 13:01:15 -0500 (Fri, 22 Dec 2017)
Log Message:
-----------
ssp is configurable

Modified Paths:
--------------
    trunk/lib/libc/Makefile

Modified: trunk/lib/libc/Makefile
===================================================================
--- trunk/lib/libc/Makefile	2017-12-22 18:01:00 UTC (rev 9720)
+++ trunk/lib/libc/Makefile	2017-12-22 18:01:15 UTC (rev 9721)
@@ -28,7 +28,9 @@
 WARNS?=	2
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 CFLAGS+=-I${.CURDIR}/${LIBC_ARCH}
+.if ${MK_NLS} != "no"
 CFLAGS+=-DNLS
+.endif
 CLEANFILES+=tags
 INSTALL_PIC_ARCHIVE=
 PRECIOUSLIB=
@@ -43,8 +45,15 @@
 #
 DPADD+=	${LIBGCC}
 LDFLAGS+= -nodefaultlibs
-LDADD+= -lgcc -lssp_nonshared
+LDADD+= -lgcc
 
+.if ${MK_SSP} != "no"
+LDADD+= -lssp_nonshared
+.endif
+
+# Extras that live in either libc.a or libc_nonshared.a
+LIBC_NONSHARED_SRCS=
+
 # Define (empty) variables so that make doesn't give substitution
 # errors if the included makefiles don't change these:
 MDSRCS=
@@ -100,6 +109,8 @@
 CFLAGS+=-D_FREEFALL_CONFIG
 .endif
 
+STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/}
+
 VERSION_DEF=${.CURDIR}/Versions.def
 SYMBOL_MAPS=${SYM_MAPS}
 CFLAGS+= -DSYMBOL_VERSIONING