Skip to content

Commit

Permalink
Don't link module LIBS to jimsh/libjim
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
msteveb committed Sep 11, 2014
1 parent c4d4bf8 commit eff75a2
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions autosetup/local.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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] {
Expand Down

0 comments on commit eff75a2

Please sign in to comment.