Skip to content

Commit 719f700

Browse files
committed
Latest upstream autosetup. Fixes two minor corner-case issues which we haven't yet seen in practice.
1 parent 9b60259 commit 719f700

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

autosetup/autosetup

+8-4
Original file line numberDiff line numberDiff line change
@@ -1634,8 +1634,8 @@ proc automf_command_reference {} {
16341634
16351635
if {[regexp {^#.*@section (.*)$} $line -> section]} {
16361636
lappend doc($current) [list section $section]
1637-
continue
1638-
}
1637+
continue
1638+
}
16391639
16401640
# Find embedded module names
16411641
if {[regexp {^#.*@module ([^ ]*)} $line -> modulename]} {
@@ -1651,7 +1651,7 @@ proc automf_command_reference {} {
16511651
if {$cmd eq "synopsis:"} {
16521652
set current $modulename
16531653
lappend doc($current) [list section "Module: $modulename"]
1654-
} else {
1654+
} else {
16551655
lappend doc($current) [list subsection $cmd]
16561656
}
16571657
@@ -2088,8 +2088,12 @@ if {$autosetup(iswin)} {
20882088
proc split-path {} {
20892089
split [getenv PATH .] :
20902090
}
2091+
# Check for an executable file
20912092
proc file-isexec {exec} {
2092-
file executable $exec
2093+
if {[file executable $exec] && [file isfile $exec]} {
2094+
return 1
2095+
}
2096+
return 0
20932097
}
20942098
}
20952099

autosetup/autosetup-find-tclsh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; d
99
done
1010
echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
1111
for cc in ${CC_FOR_BUILD:-cc} gcc; do
12-
{ $cc -o jimsh0 "$d/jimsh0.c"; } >/dev/null 2>&1 || continue
12+
{ $cc -o jimsh0 "$d/jimsh0.c"; } 2>/dev/null >/dev/null || continue
1313
./jimsh0 "$d/${1-autosetup-test-tclsh}" && exit 0
1414
done
1515
echo 1>&2 "No working C compiler found. Tried ${CC_FOR_BUILD:-cc} and gcc."

0 commit comments

Comments
 (0)