2017-12-06 01:31:37

by Liu, Changcheng

Subject: [PATCH] scripts/faddr2line: fix CROSS_COMPILE unset error

faddr2line hit var unbound error When CROSS_COMPILE
isn't set since nounset option is set in bash script.

Signed-off-by: Liu Changcheng <[email protected]>
Reported-by: Richard Weinberger <[email protected]>

diff --git a/scripts/faddr2line b/scripts/faddr2line
index 39e07d8..7721d5b 100755
--- a/scripts/faddr2line
+++ b/scripts/faddr2line
@@ -44,10 +44,10 @@
set -o errexit
set -o nounset

-READELF="${CROSS_COMPILE}readelf"
-ADDR2LINE="${CROSS_COMPILE}addr2line"
-SIZE="${CROSS_COMPILE}size"
-NM="${CROSS_COMPILE}nm"
+READELF="${CROSS_COMPILE:-}readelf"
+ADDR2LINE="${CROSS_COMPILE:-}addr2line"
+SIZE="${CROSS_COMPILE:-}size"
+NM="${CROSS_COMPILE:-}nm"

command -v awk >/dev/null 2>&1 || die "awk isn't installed"
command -v ${READELF} >/dev/null 2>&1 || die "readelf isn't installed"
--
2.7.4

2017-12-06 19:16:03

by Richard Weinberger

Subject: Re: [PATCH] scripts/faddr2line: fix CROSS_COMPILE unset error

Am Mittwoch, 6. Dezember 2017, 02:30:22 CET schrieb Liu, Changcheng:
> faddr2line hit var unbound error When CROSS_COMPILE
> isn't set since nounset option is set in bash script.
>
> Signed-off-by: Liu Changcheng <[email protected]>
> Reported-by: Richard Weinberger <[email protected]>
>
> diff --git a/scripts/faddr2line b/scripts/faddr2line
> index 39e07d8..7721d5b 100755
> --- a/scripts/faddr2line
> +++ b/scripts/faddr2line
> @@ -44,10 +44,10 @@
> set -o errexit
> set -o nounset
>
> -READELF="${CROSS_COMPILE}readelf"
> -ADDR2LINE="${CROSS_COMPILE}addr2line"
> -SIZE="${CROSS_COMPILE}size"
> -NM="${CROSS_COMPILE}nm"
> +READELF="${CROSS_COMPILE:-}readelf"
> +ADDR2LINE="${CROSS_COMPILE:-}addr2line"
> +SIZE="${CROSS_COMPILE:-}size"
> +NM="${CROSS_COMPILE:-}nm"
>
> command -v awk >/dev/null 2>&1 || die "awk isn't installed"
> command -v ${READELF} >/dev/null 2>&1 || die "readelf isn't installed"

Fixes: 95a879825419 ("scripts/faddr2line: extend usage on generic arch")
Reviewed-by: Richard Weinberger <[email protected]>

Thanks,
//richard