Skip to content

Commit fc03640

Browse files
bpo-38527: fix configure script for Solaris (GH-16845)
On Solaris, the regular "grep" command may be an old version that fails to search a binary file. We need to use the correct command (ggrep, in our case), which is found by the configure script earlier. Automerge-Triggered-By: @pablogsal (cherry picked from commit 5dd8360) Co-authored-by: Arnon Yaari <[email protected]>
1 parent f971c8c commit fc03640

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix configure check on Solaris for "float word ordering": sometimes, the correct "grep" command was not being used.
2+
Patch by Arnon Yaari.

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14303,10 +14303,10 @@ _ACEOF
1430314303
if ac_fn_c_try_compile "$LINENO"; then :
1430414304

1430514305

14306-
if grep noonsees conftest.$ac_objext >/dev/null ; then
14306+
if $GREP noonsees conftest.$ac_objext >/dev/null ; then
1430714307
ax_cv_c_float_words_bigendian=yes
1430814308
fi
14309-
if grep seesnoon conftest.$ac_objext >/dev/null ; then
14309+
if $GREP seesnoon conftest.$ac_objext >/dev/null ; then
1431014310
if test "$ax_cv_c_float_words_bigendian" = unknown; then
1431114311
ax_cv_c_float_words_bigendian=no
1431214312
else

m4/ax_c_float_words_bigendian.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ double d = 909042349670368103374704789055050114762116927356156320147971208440534
4949
5050
]])], [
5151
52-
if grep noonsees conftest.$ac_objext >/dev/null ; then
52+
if $GREP noonsees conftest.$ac_objext >/dev/null ; then
5353
ax_cv_c_float_words_bigendian=yes
5454
fi
55-
if grep seesnoon conftest.$ac_objext >/dev/null ; then
55+
if $GREP seesnoon conftest.$ac_objext >/dev/null ; then
5656
if test "$ax_cv_c_float_words_bigendian" = unknown; then
5757
ax_cv_c_float_words_bigendian=no
5858
else

0 commit comments

Comments
 (0)