Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instead of inventing a new environment variable to override the 

SSP functionality location test, use gcc_cv_libc_provides_ssp instead,
as hinted by freza@ and uwe@.
This commit is contained in:
he 2007-06-07 14:36:27 +00:00
parent 14f772ea69
commit 678b5429b3
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/dist/gcc4/gcc/configure.ac vendored
View File

@ -3124,16 +3124,14 @@ case "$target" in
fi
fi]) ;;
*-*-netbsd*)
if test x$TARGET_LIBC_PROVIDES_SSP != x; then
gcc_cv_libc_provides_ssp=$TARGET_LIBC_PROVIDES_SSP
else
if $gcc_cv_nm $($CC -print-file-name=libc.a) | \
AC_CACHE_CHECK(__stack_chk_guard in C library,
gcc_cv_libc_provides_ssp,
[if $gcc_cv_nm $($CC -print-file-name=libc.a) | \
grep 'B __stack_chk_guard' > /dev/null; then
gcc_cv_libc_provides_ssp=yes
else
gcc_cv_libc_provides_ssp=no
fi
fi ;;
fi]) ;;
*) gcc_cv_libc_provides_ssp=no ;;
esac
if test x$gcc_cv_libc_provides_ssp = xyes; then

4
tools/gcc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2007/06/07 08:58:58 he Exp $
# $NetBSD: Makefile,v 1.26 2007/06/07 14:36:27 he Exp $
.include <bsd.own.mk>
@ -23,7 +23,7 @@ MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
EXTRA_PARTS= CPPFLAGS=-DNETBSD_TOOLS \
AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q}
CONFIGURE_ENV+= TARGET_LIBC_PROVIDES_SSP=yes
CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes
MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
CC_FOR_BUILD=${HOST_CC:Q} \