diff options
| author | dgp <dgp@users.sourceforge.net> | 2003-03-19 21:57:29 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2003-03-19 21:57:29 (GMT) |
| commit | bb7105fe9e61473e34a6dfa06700dbc252afeb19 (patch) | |
| tree | 442e8a70c6a7eb9cab94e31ce02f4e195e3956b3 /library/ldAout.tcl | |
| parent | 2f7a25d9e6cc43c401cbb12b0a35adca9ba526ca (diff) | |
| download | tcl-bb7105fe9e61473e34a6dfa06700dbc252afeb19.zip tcl-bb7105fe9e61473e34a6dfa06700dbc252afeb19.tar.gz tcl-bb7105fe9e61473e34a6dfa06700dbc252afeb19.tar.bz2 | |
* library/auto.tcl: Replaced [regexp] and [regsub] with
* library/history.tcl: [string map] where possible. Thanks
* library/ldAout.tcl: to David Welton. [Bugs 667456,667558]
* library/safe.tcl: Bumped to http 2.4.3, opt 0.4.5, and
* library/http/http.tcl: tcltest 2.2.3.
* library/http/pkgIndex.tcl:
* library/opt/optparse.tcl:
* library/opt/pkgIndex.tcl:
* library/tcltest/tcltest.tcl:
* library/tcltest/pkgIndex.tcl:
* tools/genStubs.tcl:
* tools/tcltk-man2html.tcl:
* unix/mkLinks.tcl:
Diffstat (limited to 'library/ldAout.tcl')
| -rw-r--r-- | library/ldAout.tcl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/ldAout.tcl b/library/ldAout.tcl index 243c6d4..c32f174 100644 --- a/library/ldAout.tcl +++ b/library/ldAout.tcl @@ -18,7 +18,7 @@ # its .o file placed before all others in the command; then # "ld" is executed to bind the objects together. # -# RCS: @(#) $Id: ldAout.tcl,v 1.5 2001/09/28 01:21:53 dgp Exp $ +# RCS: @(#) $Id: ldAout.tcl,v 1.6 2003/03/19 21:57:42 dgp Exp $ # # Copyright (c) 1995, by General Electric Company. All rights reserved. # @@ -88,9 +88,9 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { } elseif {![string compare $a -o]} { set minusO 1 } - if {[regexp {^-[lL]} $a]} { + if {[string match -nocase "-l*" $a]} { lappend libraries $a - if {[regexp {^-L} $a]} { + if {[string match "-L*" $a]} { lappend libdirs [string range $a 2 end] } } elseif {$seenDotO} { @@ -106,7 +106,7 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { set libs {} foreach lib $libraries { - if {[regexp {^-l} $lib]} { + if {[string match "-l*" $lib]} { set lname [string range $lib 2 end] foreach dir $libdirs { if {[file exists [file join $dir lib${lname}_G0.a]]} { @@ -138,7 +138,7 @@ proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} { error "Output file does not appear to have a suffix" } set modName [string tolower $m 0 [expr {$l-1}]] - if {[regexp {^lib} $modName]} { + if {[string match "lib*" $modName]} { set modName [string range $modName 3 end] } if {[regexp {[0-9\.]*(_g0)?$} $modName match]} { |