Roll back part of [6d87a8efe]: the check for tclsh90.exe (as opposed to tclsh9.0.exe) is incorrect on these platforms (it's an msvc build). Also remove an unused function added in that checkin.
FossilOrigin-Name: dc84976a7c0d0028b7c576d54e18d1b8e1fc2376bc7b0504f1c86e82c1f7c814
This commit is contained in:
@@ -1692,14 +1692,6 @@ proc sqlite-handle-wasi-sdk {} {
|
||||
return 1
|
||||
}; # sqlite-handle-wasi-sdk
|
||||
|
||||
set sqliteConfig(host-is-windows) [proj-looks-like-windows]
|
||||
proc sqlite-bin-for-name {fname} {
|
||||
if {$::sqliteConfig(host-is-windows)} {
|
||||
return ${fname}.exe
|
||||
}
|
||||
return $fname
|
||||
}
|
||||
|
||||
########################################################################
|
||||
# TCL...
|
||||
#
|
||||
@@ -1768,7 +1760,7 @@ proc sqlite-check-tcl {} {
|
||||
if {"" eq $with_tclsh && "" eq $with_tcl} {
|
||||
# If neither --with-tclsh nor --with-tcl are provided, try to find
|
||||
# a workable tclsh.
|
||||
set with_tclsh [proj-first-bin-of tclsh9.0 tclsh90 tclsh8.6 tclsh]
|
||||
set with_tclsh [proj-first-bin-of tclsh9.0 tclsh8.6 tclsh]
|
||||
msg-debug "sqlite-check-tcl: with_tclsh=${with_tclsh}"
|
||||
}
|
||||
|
||||
@@ -1794,7 +1786,7 @@ proc sqlite-check-tcl {} {
|
||||
}
|
||||
}
|
||||
set cfg ""
|
||||
set tclSubdirs {tcl9.0 tcl90 tcl8.6 lib}
|
||||
set tclSubdirs {tcl9.0 tcl8.6 lib}
|
||||
while {$use_tcl} {
|
||||
if {"" ne $with_tcl} {
|
||||
# Ensure that we can find tclConfig.sh under ${with_tcl}/...
|
||||
@@ -1847,12 +1839,11 @@ proc sqlite-check-tcl {} {
|
||||
if {"" eq $with_tclsh && $cfg ne ""} {
|
||||
# We have tclConfig.sh but no tclsh. Attempt to locate a tclsh
|
||||
# based on info from tclConfig.sh.
|
||||
proj-assert {"" ne [get-define TCL_EXEC_PREFIX]}
|
||||
set tryThese ""
|
||||
lappend tryThese [get-define TCL_EXEC_PREFIX]/bin/tclsh[get-define TCL_VERSION]
|
||||
lappend tryThese [get-define TCL_EXEC_PREFIX]/bin/tclsh[string map {. {}} [get-define TCL_VERSION]]
|
||||
# ^^^^ cygwin
|
||||
lappend tryThese [get-define TCL_EXEC_PREFIX]/bin/tclsh
|
||||
set tclExecPrefix [get-define TCL_EXEC_PREFIX]
|
||||
proj-assert {"" ne $tclExecPrefix}
|
||||
set tryThese [list \
|
||||
$tclExecPrefix/bin/tclsh[get-define TCL_VERSION] \
|
||||
$tclExecPrefix/bin/tclsh ]
|
||||
foreach trySh $tryThese {
|
||||
if {[file-isexec $trySh]} {
|
||||
set with_tclsh $trySh
|
||||
|
||||
15
manifest
15
manifest
@@ -1,5 +1,5 @@
|
||||
C Teach\sautosetup\show\sto\sfind\stclsh\sv9.0\son\scygwin.
|
||||
D 2025-03-04T19:38:38.251
|
||||
C Roll\sback\spart\sof\s[6d87a8efe]:\sthe\scheck\sfor\stclsh90.exe\s(as\sopposed\sto\stclsh9.0.exe)\sis\sincorrect\son\sthese\splatforms\s(it's\san\smsvc\sbuild).\sAlso\sremove\san\sunused\sfunction\sadded\sin\sthat\scheckin.
|
||||
D 2025-03-04T21:31:18.234
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
|
||||
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
|
||||
F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
|
||||
F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
|
||||
F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e
|
||||
F autosetup/sqlite-config.tcl 6e424756dc468d9e6e26051f8b694d486e6864f73278611a5140ff53c5f3520a
|
||||
F autosetup/sqlite-config.tcl 8e6cc8afe56eed424492d85560fbac0a1598023083f49469e9eb747a5757125e
|
||||
F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
|
||||
F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
|
||||
F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
|
||||
@@ -2213,11 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
|
||||
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
|
||||
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
|
||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||
P 5a3e22999f8da075f7ca3e039f10386fb85295a2457c9495d2c48b7137a84296
|
||||
R 3803ce35217f6b91028e02d18ca2d3be
|
||||
T *branch * cygwin-fixes
|
||||
T *sym-cygwin-fixes *
|
||||
T -sym-trunk *
|
||||
P 6d87a8efe5611102eac150e5dc1e9d9602318ab8b96046b29c66602e7c3d12fa
|
||||
R dd006be558923f890b46aac2f51c7112
|
||||
U stephan
|
||||
Z 985140384a8fdd4332f9c255cb587008
|
||||
Z 914d2317d954893446b64351aff9877e
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
@@ -1 +1 @@
|
||||
6d87a8efe5611102eac150e5dc1e9d9602318ab8b96046b29c66602e7c3d12fa
|
||||
dc84976a7c0d0028b7c576d54e18d1b8e1fc2376bc7b0504f1c86e82c1f7c814
|
||||
|
||||
Reference in New Issue
Block a user