diff options
author | Steve Bennett <steveb@workware.net.au> | 2023-07-10 13:54:31 +1000 |
---|---|---|
committer | Steve Bennett <steveb@workware.net.au> | 2023-07-10 13:57:05 +1000 |
commit | 6a1af5b541395f4aa4ab745def9885365d60eb3a (patch) | |
tree | 51d9eb7f81364bcf16dcc6ac9eb494934d204d76 /autosetup/system.tcl | |
parent | e7872e67777466e71a3df3b06cb60c277f4e63b1 (diff) | |
download | jimtcl-6a1af5b541395f4aa4ab745def9885365d60eb3a.zip jimtcl-6a1af5b541395f4aa4ab745def9885365d60eb3a.tar.gz jimtcl-6a1af5b541395f4aa4ab745def9885365d60eb3a.tar.bz2 |
build: update autosetup to v0.7.1-11-g9d20e8a
Mostly for update bootstrap jimsh
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'autosetup/system.tcl')
-rw-r--r-- | autosetup/system.tcl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/autosetup/system.tcl b/autosetup/system.tcl index 739a637..f23781b 100644 --- a/autosetup/system.tcl +++ b/autosetup/system.tcl @@ -209,7 +209,12 @@ proc include-file {infile mapping} { } } continue - } elseif {[regexp {^@include\s+(.*)} $line -> filearg]} { + } + # Only continue if the stack contains all "true" + if {"0" in $condstack} { + continue + } + if {[regexp {^@include\s+(.*)} $line -> filearg]} { set incfile [string map $mapping $filearg] if {[file exists $incfile]} { lappend ::autosetup(deps) [file-normalize $incfile] @@ -218,12 +223,9 @@ proc include-file {infile mapping} { user-error "$infile:$linenum: Include file $incfile is missing" } continue - } elseif {[regexp {^@define\s+(\w+)\s+(.*)} $line -> var val]} { - define $var $val - continue } - # Only output this line if the stack contains all "true" - if {"0" in $condstack} { + if {[regexp {^@define\s+(\w+)\s+(.*)} $line -> var val]} { + define $var $val continue } lappend result $line |