diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 4 | ||||
| -rw-r--r-- | libjava/configure.ac | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2968be1728c..0d4e9067648 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + * configure.ac: Redirect grep stdout, stderr to /dev/null instead + of grep -q. + Use -- instead of grep -e. + * configure: Regenerate. + +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + PR libgcj/44216 * configure.ac (libgcj_cv_exidx): Enable AC_LANG_WERROR. Save and restore werror flag. diff --git a/libjava/configure b/libjava/configure index 8f549050da2..06ba4e98b41 100755 --- a/libjava/configure +++ b/libjava/configure @@ -24520,8 +24520,8 @@ fi # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= -if $LD --help 2>&1 | grep -q -e -call_shared ; then - if $LD --help 2>&1 | grep -q -e -non_shared ; then +if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then + if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}' LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}' fi diff --git a/libjava/configure.ac b/libjava/configure.ac index 5376a0157ea..a359afed7bd 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1778,8 +1778,8 @@ AM_CONDITIONAL(ANONVERSCRIPT, test "$libjava_cv_anon_version_script" = yes) # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= -if $LD --help 2>&1 | grep -q -e -call_shared ; then - if $LD --help 2>&1 | grep -q -e -non_shared ; then +if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then + if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}' LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}' fi |
