[Scummvm-git-logs] scummvm-tools master -> 93e995248055c391fbaddb4ebfaebc0a176befd9

lephilousophe lephilousophe at users.noreply.github.com
Fri Jan 8 18:48:44 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
93e9952480 CONFIGURE: Backport strings binary detection from scummvm


Commit: 93e995248055c391fbaddb4ebfaebc0a176befd9
    https://github.com/scummvm/scummvm-tools/commit/93e995248055c391fbaddb4ebfaebc0a176befd9
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-01-08T19:48:41+01:00

Commit Message:
CONFIGURE: Backport strings binary detection from scummvm

This lets use the toolchain provided one instead of the system one

Changed paths:
    configure


diff --git a/configure b/configure
index 1a455d365..17fdb9674 100755
--- a/configure
+++ b/configure
@@ -1021,6 +1021,20 @@ android | gamecube | psp | wii)
 	fi
 	;;
 esac
+
+if test -n "$STRINGS"; then
+	_strings=$STRINGS
+else
+	echo_n "Checking for $_host_alias-strings... " >> "$TMPLOG"
+	if `which $_host_alias-strings >/dev/null 2>&1`; then
+		_strings=$_host_alias-strings
+		echo yes >> "$TMPLOG"
+	else
+		_strings=strings
+		echo no >> "$TMPLOG"
+	fi
+fi
+
 #
 # Check for endianness
 #
@@ -1035,9 +1049,9 @@ void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }
 int main() { _ascii (); _ebcdic (); return 0; }
 EOF
 $CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
-if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
+if $_strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
 	_endian=big
-elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
+elif $_strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
 	_endian=little
 fi
 echo $_endian;




More information about the Scummvm-git-logs mailing list