Fossil SCM
Upstream fix to autosetup/autosetup-find-tcl to work around an OpenBSD-ism of emitting noise to stdout at link-time.
Commit
ddfc5c4267431da4d64b89f72a936cd49c3c6ce66e2970f3e711c3aaabb264b8
Parent
40d0b360d2cf9d7…
1 file changed
+3
-3
+3
-3
| --- autosetup/autosetup-find-tclsh | ||
| +++ autosetup/autosetup-find-tclsh | ||
| @@ -3,14 +3,14 @@ | ||
| 3 | 3 | # If not found, builds a bootstrap jimsh in current dir from source |
| 4 | 4 | # Prefer $autosetup_tclsh if is set in the environment (unless ./jimsh0 works) |
| 5 | 5 | # If an argument is given, use that as the test instead of autosetup-test-tclsh |
| 6 | 6 | d="`dirname "$0"`" |
| 7 | 7 | for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; do |
| 8 | - { $tclsh "$d/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0 | |
| 8 | + { $tclsh "$d/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0 | |
| 9 | 9 | done |
| 10 | 10 | echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0" |
| 11 | 11 | for cc in ${CC_FOR_BUILD:-cc} gcc; do |
| 12 | - { $cc -o jimsh0 "$d/jimsh0.c"; } 2>&1 >/dev/null || continue | |
| 13 | - ./jimsh0 "$d/${1-autosetup-test-tclsh}" && exit 0 | |
| 12 | + { $cc -o jimsh0 "$d/jimsh0.c"; } >/dev/null 2>&1 || continue | |
| 13 | + ./jimsh0 "$d/${1-autosetup-test-tclsh}" && exit 0 | |
| 14 | 14 | done |
| 15 | 15 | echo 1>&2 "No working C compiler found. Tried ${CC_FOR_BUILD:-cc} and gcc." |
| 16 | 16 | echo false |
| 17 | 17 |
| --- autosetup/autosetup-find-tclsh | |
| +++ autosetup/autosetup-find-tclsh | |
| @@ -3,14 +3,14 @@ | |
| 3 | # If not found, builds a bootstrap jimsh in current dir from source |
| 4 | # Prefer $autosetup_tclsh if is set in the environment (unless ./jimsh0 works) |
| 5 | # If an argument is given, use that as the test instead of autosetup-test-tclsh |
| 6 | d="`dirname "$0"`" |
| 7 | for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; do |
| 8 | { $tclsh "$d/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0 |
| 9 | done |
| 10 | echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0" |
| 11 | for cc in ${CC_FOR_BUILD:-cc} gcc; do |
| 12 | { $cc -o jimsh0 "$d/jimsh0.c"; } 2>&1 >/dev/null || continue |
| 13 | ./jimsh0 "$d/${1-autosetup-test-tclsh}" && exit 0 |
| 14 | done |
| 15 | echo 1>&2 "No working C compiler found. Tried ${CC_FOR_BUILD:-cc} and gcc." |
| 16 | echo false |
| 17 |
| --- autosetup/autosetup-find-tclsh | |
| +++ autosetup/autosetup-find-tclsh | |
| @@ -3,14 +3,14 @@ | |
| 3 | # If not found, builds a bootstrap jimsh in current dir from source |
| 4 | # Prefer $autosetup_tclsh if is set in the environment (unless ./jimsh0 works) |
| 5 | # If an argument is given, use that as the test instead of autosetup-test-tclsh |
| 6 | d="`dirname "$0"`" |
| 7 | for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; do |
| 8 | { $tclsh "$d/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0 |
| 9 | done |
| 10 | echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0" |
| 11 | for cc in ${CC_FOR_BUILD:-cc} gcc; do |
| 12 | { $cc -o jimsh0 "$d/jimsh0.c"; } >/dev/null 2>&1 || continue |
| 13 | ./jimsh0 "$d/${1-autosetup-test-tclsh}" && exit 0 |
| 14 | done |
| 15 | echo 1>&2 "No working C compiler found. Tried ${CC_FOR_BUILD:-cc} and gcc." |
| 16 | echo false |
| 17 |