database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Remove some proj-assert checks which are not valid on OpenBSD. Ensure that queued up notices about TCL warnings are displayed before leaving sqlite-check-tcl.

Browse Source 
FossilOrigin-Name: 3447308f3f66046ffedd502161757211bef0384d7a735ff675c06c04fbc22655
This commit is contained in:
stephan
2024-10-31 08:03:35 +00:00
parent 7be78606ff
commit ec04c41be6
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
auto.def
View File

@ -568,15 +568,13 @@ proc sqlite-check-tcl {} {
}
break
}
define TCL_CONFIG_SH $cfg
# Export a subset of tclConfig.sh to the current TCL-space. If the
# config is not available, this emits empty-string entries for the
# various options we're interested in.
eval [exec "${top_srcdir}/tool/tclConfigShToTcl.sh" "$cfg"]
if {"" eq $with_tclsh} {
proj-assert {expr {$cfg ne ""}}
if {"" eq $with_tclsh && $cfg ne ""} {
proj-assert {expr {"" ne [get-define TCL_EXEC_PREFIX]}}
set with_tclsh [get-define TCL_EXEC_PREFIX]/bin/tclsh[get-define TCL_VERSION]
if {![file-isexec $with_tclsh]} {
@ -589,8 +587,6 @@ proc sqlite-check-tcl {} {
}
}
define TCLSH_CMD $with_tclsh
proj-assert {expr {( $cfg eq "" && 0 == $use_tcl ) \
|| ( $cfg ne "" && 1 == $use_tcl )}}
if {$use_tcl} {
# Set up the TCLLIBDIR and TCLLIB_RPATH
#
@ -638,6 +634,7 @@ proc sqlite-check-tcl {} {
} else {
proj-warn "Cannot find a usable tclsh, so cannot run tests."
}
show-notices
}; # sqlite-check-tcl
sqlite-check-tcl