File tree 1 file changed +12
-2
lines changed
1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ putvar() {
71
71
then
72
72
printf " configure: %-20s := %.35s ...\n" $1 " $T "
73
73
else
74
- printf " configure: %-20s := %s\n" $1 " $T "
74
+ printf " configure: %-20s := %s %s \n" $1 " $T " " $2 "
75
75
fi
76
76
printf " %-20s := %s\n" $1 " $T " >> config.tmp
77
77
}
@@ -86,13 +86,22 @@ probe() {
86
86
T=$( which $P 2>&1 )
87
87
if [ $? -eq 0 ]
88
88
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
89
97
break
90
98
else
99
+ VER=" "
91
100
T=" "
92
101
fi
93
102
done
94
103
eval $V =\$ T
95
- putvar $V
104
+ putvar $V " $VER "
96
105
}
97
106
98
107
probe_need () {
316
325
317
326
probe CFG_CLANG clang++
318
327
probe CFG_GCC gcc
328
+ probe CFG_LD ld
319
329
probe CFG_LLVM_CONFIG llvm-config
320
330
probe CFG_VALGRIND valgrind
321
331
probe CFG_PERF perf
You can’t perform that action at this time.
0 commit comments