diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2008-06-25 21:33:28 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2008-06-25 21:33:28 +0000 |
| commit | 042df2e2dadea9f43b62b79ed97534c0eecf1dad (patch) | |
| tree | 3821989620f33150162837ccfad067791bb346ca /gnu | |
| parent | 0d9e99b6ca4f54bf4f902715e8870d9ff19a8afa (diff) | |
Notes
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/Makefile | 6 | ||||
| -rw-r--r-- | gnu/lib/csu/Makefile | 1 | ||||
| -rw-r--r-- | gnu/lib/libssp/Makefile | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 0db955fa0f57..00b77e23206c 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -2,7 +2,7 @@ .include <bsd.own.mk> -SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline +SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. @@ -14,8 +14,4 @@ SUBDIR+= libstdc++ libsupc++ SUBDIR+= libobjc .endif -.if ${MK_SSP} != "no" -SUBDIR+= libssp -.endif - .include <bsd.subdir.mk> diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index 63cd02a1134f..6a279690ccf9 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -19,6 +19,7 @@ CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEP= -DCRT_BEGIN +WITHOUT_SSP= .if ${MACHINE_ARCH} == "ia64" BEGINSRC= crtbegin.asm diff --git a/gnu/lib/libssp/Makefile b/gnu/lib/libssp/Makefile index 90f2a8a50ad0..4f6170e78423 100644 --- a/gnu/lib/libssp/Makefile +++ b/gnu/lib/libssp/Makefile @@ -10,6 +10,7 @@ LIB= ssp SHLIB_MAJOR= 0 SHLIBDIR?= /lib NO_PROFILE= +WITHOUT_SSP= SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \ |