AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 14:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop -q flag when using grep

Browse Source 
We don't currently want to rely on the -q option to grep.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2012-10-23 22:37:50 -04:00
parent 10b40d8567
commit 8175a2532b
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2012-10-24 Mike Frysinger <vapier@gentoo.org>
* configure.in (libc_cv_gcc_static_libgcc): Drop -q flag to grep and
send the output to /dev/null.
(libc_cv_cc_with_libunwind): Likewise.
(libc_cv_as_noexecstack): Likewise.
* configure: Regenerate.
2012-10-24 Joseph Myers <joseph@codesourcery.com> 2012-10-24 Joseph Myers <joseph@codesourcery.com>
* io/ftwtest-sh (tmp): Define to ${objpfx}io, not using `pwd`. * io/ftwtest-sh (tmp): Define to ${objpfx}io, not using `pwd`.

6
configure vendored
View File

@ -5384,7 +5384,7 @@ $as_echo_n "checking whether GCC supports -static-libgcc... " >&6; }
if ${libc_cv_gcc_static_libgcc+:} false; then : if ${libc_cv_gcc_static_libgcc+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
if $CC -v -static-libgcc 2>&1 | grep -q 'unrecognized option.*static-libgcc'; then if $CC -v -static-libgcc 2>&1 | grep 'unrecognized option.*static-libgcc' >/dev/null; then
libc_cv_gcc_static_libgcc= libc_cv_gcc_static_libgcc=
else else
libc_cv_gcc_static_libgcc=-static-libgcc libc_cv_gcc_static_libgcc=-static-libgcc
@ -6139,7 +6139,7 @@ else
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then conftest.c -v 2>&1 >/dev/null | grep ' -lunwind ' >/dev/null; then
libc_cv_cc_with_libunwind=yes libc_cv_cc_with_libunwind=yes
else else
libc_cv_cc_with_libunwind=no libc_cv_cc_with_libunwind=no
@ -6370,7 +6370,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS
ac_status=$? ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; } \ test $ac_status = 0; }; } \
&& grep -q .note.GNU-stack conftest.s \ && grep .note.GNU-stack conftest.s >/dev/null \
&& { ac_try='${CC-cc} $ASFLAGS -Wa,--noexecstack && { ac_try='${CC-cc} $ASFLAGS -Wa,--noexecstack
-c -o conftest.o conftest.s 1>&5' -c -o conftest.o conftest.s 1>&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5

6
configure.in
View File

@ -1011,7 +1011,7 @@ AC_MSG_ERROR([
fi fi
AC_CACHE_CHECK(whether GCC supports -static-libgcc, libc_cv_gcc_static_libgcc, [dnl AC_CACHE_CHECK(whether GCC supports -static-libgcc, libc_cv_gcc_static_libgcc, [dnl
if $CC -v -static-libgcc 2>&1 | grep -q 'unrecognized option.*static-libgcc'; then if $CC -v -static-libgcc 2>&1 | grep 'unrecognized option.*static-libgcc' >/dev/null; then
libc_cv_gcc_static_libgcc= libc_cv_gcc_static_libgcc=
else else
libc_cv_gcc_static_libgcc=-static-libgcc libc_cv_gcc_static_libgcc=-static-libgcc
@ -1376,7 +1376,7 @@ AC_CACHE_CHECK(for libunwind-support in compiler,
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then conftest.c -v 2>&1 >/dev/null | grep ' -lunwind ' >/dev/null; then
libc_cv_cc_with_libunwind=yes libc_cv_cc_with_libunwind=yes
else else
libc_cv_cc_with_libunwind=no libc_cv_cc_with_libunwind=no
@ -1526,7 +1526,7 @@ void foo (void) { }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS
-S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \ -S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \
&& grep -q .note.GNU-stack conftest.s \ && grep .note.GNU-stack conftest.s >/dev/null \
&& AC_TRY_COMMAND([${CC-cc} $ASFLAGS -Wa,--noexecstack && AC_TRY_COMMAND([${CC-cc} $ASFLAGS -Wa,--noexecstack
-c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD]) -c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD])
then then