diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2023-05-22 15:53:31 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2023-05-22 15:58:29 -0400 |
| commit | 56fe1129da1b59eea4cac351707bc9eaabfb853c (patch) | |
| tree | a54c32cd50549da6ffa7aaf89d1fac3f548dd62f | |
| parent | e7cc77e5b882be40122010b037401d3e9a4c519b (diff) | |
| download | rockbox-56fe1129da1b59eea4cac351707bc9eaabfb853c.tar.gz rockbox-56fe1129da1b59eea4cac351707bc9eaabfb853c.zip | |
configure: Deal with more variations of the 'ld' version output
eg, our current toolchian generates this:
GNU ld (GNU Binutils) 2.26.1
But the system toolchain on the buildserver generates this:
GNU ld version 2.37-37.fc36
Change-Id: I0166f12d660654c1456289954fb256db98213618
| -rwxr-xr-x | tools/configure | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure b/tools/configure index 651346ecd8..1f758a967d 100755 --- a/tools/configure +++ b/tools/configure | |||
| @@ -4360,7 +4360,7 @@ gccver=`$CC -dumpversion`; | |||
| 4360 | if [ $uname = "Darwin" ]; then | 4360 | if [ $uname = "Darwin" ]; then |
| 4361 | ldver=`$LD -v 2>&1 | sed -e 's/[^0-9.-]//g'` | 4361 | ldver=`$LD -v 2>&1 | sed -e 's/[^0-9.-]//g'` |
| 4362 | else | 4362 | else |
| 4363 | ldver=`$LD --version | head -n 1 | sed -e 's/\ /\n/g' | tail -n 1` | 4363 | ldver=`$LD --version | sed -n '1p' | sed -e 's/.* \([0-9]*\)\.\([0-9]*\).*/\1\2/'` |
| 4364 | fi | 4364 | fi |
| 4365 | 4365 | ||
| 4366 | # Convert LD version to a number major*100 + minor | 4366 | # Convert LD version to a number major*100 + minor |