diff options
| author | Steve Bennett <steveb@workware.net.au> | 2014-09-11 11:50:51 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2014-09-11 11:50:51 +1000 |
| commit | eff75a2ecc134c54cb6524f09144acaa2b3624aa (patch) | |
| tree | 7ad9e4162df4749ca5d55cd823d0d587d02863f0 /autosetup | |
| parent | c4d4bf8bc104733db1f5992a27d88fbfca9ba882 (diff) | |
Don't link module LIBS to jimsh/libjim
Some libraries are only required for specific dynamic modules, so don't
include them when linking jimsh or libjim.so
Reported-by: Stuart Cassoff
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'autosetup')
| -rw-r--r-- | autosetup/local.tcl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/autosetup/local.tcl b/autosetup/local.tcl index 36aff86..a5da8b0 100644 --- a/autosetup/local.tcl +++ b/autosetup/local.tcl @@ -55,6 +55,9 @@ proc check-extension-status {ext required} { array set depinfo {m 0 y 0 n 0} + # Stash the current value of LIBS + set LIBS [get-define LIBS] + # Check direct dependencies if [ext-get $ext check 1] { # "check" conditions are met @@ -63,6 +66,12 @@ proc check-extension-status {ext required} { incr depinfo(n) } + if {$ext in $withinfo(mod)} { + # This is a module, so ignore LIBS + # LDLIBS_$ext will contain the appropriate libs for this module + define LIBS $LIBS + } + if {$depinfo(n) == 0} { # Now extension dependencies foreach i [ext-get $ext dep] { |