diff mbox

[OpenWrt-Devel] fix 64bit uclibc external toolchain detection

Message ID 559CB656.8040205@web.de
State Accepted
Headers show

Commit Message

Dirk Neukirchen July 8, 2015, 5:34 a.m. UTC
according to gcc, UCLIBC_DYNAMIC_LINKER64

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
---
 scripts/ext-toolchain.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

John Crispin July 14, 2015, 9:19 a.m. UTC | #1
Hi Dirk,

please make sure to use a proper prefix for your patches. i just fixed
this manually while merging so no need to resend.

	John

On 08/07/2015 07:34, Dirk Neukirchen wrote:
> according to gcc, UCLIBC_DYNAMIC_LINKER64
> 
> Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
> ---
>  scripts/ext-toolchain.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh
> index 3ebaa21..a552fbe 100755
> --- a/scripts/ext-toolchain.sh
> +++ b/scripts/ext-toolchain.sh
> @@ -91,7 +91,7 @@ test_uclibc() {
>  	local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)"
>  	if [ -d "${sysroot:-$TOOLCHAIN}" ]; then
>  		local lib
> -		for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld-uClibc*.so*; do
> +		for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld*-uClibc*.so*; do
>  			if [ -f "$lib" ] && [ ! -h "$lib" ]; then
>  				return 0
>  			fi
>
diff mbox

Patch

diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh
index 3ebaa21..a552fbe 100755
--- a/scripts/ext-toolchain.sh
+++ b/scripts/ext-toolchain.sh
@@ -91,7 +91,7 @@  test_uclibc() {
 	local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)"
 	if [ -d "${sysroot:-$TOOLCHAIN}" ]; then
 		local lib
-		for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld-uClibc*.so*; do
+		for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld*-uClibc*.so*; do
 			if [ -f "$lib" ] && [ ! -h "$lib" ]; then
 				return 0
 			fi