Skip to contentSkip to conversation

scripts/faddr2line: fix CROSS_COMPILE unset error

PATCH In review Liu, Changcheng 2 participants 2 messages Dec 6, 2017 FADDR2LINE

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

scripts/faddr2line +4 -4
index 39e07d8..7721d5b 100755
@@ -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"
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw

Am Mittwoch, 6. Dezember 2017, 02:30:22 CET schrieb Liu, Changcheng:

Quoted 15 lines

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

scripts/faddr2line +0 -1
index 39e07d8..7721d5b 100755
@@ -44,10 +44,10 @@
 set -o errexit
 set -o nounset
 
-READELF="${CROSS_COMPILE}readelf"

scripts/faddr2line line 53

Quoted 10 lines
scripts/faddr2line +4 -3
-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")

Thanks,
//richard