Fossil SCM
Fix an 'auto.def' issue that prevented using --with-tcl of a static Tcl with --static.
Commit
28fd1c1bd4e438b6ed7a31906c6f23776609ea4aff3c9aad6a9275be2f074d15
Parent
563d481e6a186df…
1 file changed
+3
M
auto.def
+3
| --- auto.def | ||
| +++ auto.def | ||
| @@ -359,10 +359,13 @@ | ||
| 359 | 359 | } |
| 360 | 360 | } else { |
| 361 | 361 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 362 | 362 | set msg "at $tclpath" |
| 363 | 363 | } |
| 364 | + if {[opt-bool static]} { | |
| 365 | + set tclconfig(TCL_LD_FLAGS) { } | |
| 366 | + } | |
| 364 | 367 | if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} { |
| 365 | 368 | user-error "Cannot find Tcl $msg" |
| 366 | 369 | } |
| 367 | 370 | set tclstubs [opt-bool with-tcl-stubs] |
| 368 | 371 | if {$tclprivatestubs} { |
| 369 | 372 |
| --- auto.def | |
| +++ auto.def | |
| @@ -359,10 +359,13 @@ | |
| 359 | } |
| 360 | } else { |
| 361 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 362 | set msg "at $tclpath" |
| 363 | } |
| 364 | if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} { |
| 365 | user-error "Cannot find Tcl $msg" |
| 366 | } |
| 367 | set tclstubs [opt-bool with-tcl-stubs] |
| 368 | if {$tclprivatestubs} { |
| 369 |
| --- auto.def | |
| +++ auto.def | |
| @@ -359,10 +359,13 @@ | |
| 359 | } |
| 360 | } else { |
| 361 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 362 | set msg "at $tclpath" |
| 363 | } |
| 364 | if {[opt-bool static]} { |
| 365 | set tclconfig(TCL_LD_FLAGS) { } |
| 366 | } |
| 367 | if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} { |
| 368 | user-error "Cannot find Tcl $msg" |
| 369 | } |
| 370 | set tclstubs [opt-bool with-tcl-stubs] |
| 371 | if {$tclprivatestubs} { |
| 372 |