Skip to content

Commit b2ec26c

Browse files
committed
Print configure script found toolchain version
Closes #2169
1 parent 1dac883 commit b2ec26c

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

configure

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ putvar() {
7171
then
7272
printf "configure: %-20s := %.35s ...\n" $1 "$T"
7373
else
74-
printf "configure: %-20s := %s\n" $1 "$T"
74+
printf "configure: %-20s := %s %s\n" $1 "$T" "$2"
7575
fi
7676
printf "%-20s := %s\n" $1 "$T" >>config.tmp
7777
}
@@ -86,13 +86,22 @@ probe() {
8686
T=$(which $P 2>&1)
8787
if [ $? -eq 0 ]
8888
then
89+
VER0=$($P --version 2>/dev/null | head -1 \
90+
| sed -e 's/[^0-9]*\([vV]\?[0-9.]\+[^ ]*\).*/\1/' )
91+
if [ $? -eq 0 -a "x${VER0}" != "x" ]
92+
then
93+
VER="($VER0)"
94+
else
95+
VER=""
96+
fi
8997
break
9098
else
99+
VER=""
91100
T=""
92101
fi
93102
done
94103
eval $V=\$T
95-
putvar $V
104+
putvar $V "$VER"
96105
}
97106

98107
probe_need() {
@@ -316,6 +325,7 @@ fi
316325

317326
probe CFG_CLANG clang++
318327
probe CFG_GCC gcc
328+
probe CFG_LD ld
319329
probe CFG_LLVM_CONFIG llvm-config
320330
probe CFG_VALGRIND valgrind
321331
probe CFG_PERF perf

0 commit comments

Comments
 (0)