diff options
| author | Eric Milkie <milkie@10gen.com> | 2013-06-06 15:05:15 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2013-06-06 15:05:29 -0400 |
| commit | db76ce6eefbdb4f6887e3136a707b3010c360cc7 (patch) | |
| tree | fc915c7060cc0b342b63af284be5400881422ebe | |
| parent | 80cc5892d74c9377d4a2c08087affe5b9852d120 (diff) | |
| download | mongo-db76ce6eefbdb4f6887e3136a707b3010c360cc7.tar.gz | |
Fix SYSLIBDEPS to not add empty libraries to link list, to match LIBDEPS' behavior
| -rw-r--r-- | site_scons/libdeps.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/site_scons/libdeps.py b/site_scons/libdeps.py index 0e51743381e..69190aab1c3 100644 --- a/site_scons/libdeps.py +++ b/site_scons/libdeps.py @@ -121,8 +121,9 @@ def __get_syslibdeps(node): if not hasattr(node.attributes, cached_var_name): syslibdeps = [] for lib in __get_libdeps(node): - for syslib in lib.get_env().get(syslibdeps_env_var, []): - syslibdeps.append(syslib) + for syslib in node.get_env().Flatten(lib.get_env().get(syslibdeps_env_var, [])): + if syslib: + syslibdeps.append(syslib) setattr(node.attributes, cached_var_name, syslibdeps) return getattr(node.attributes, cached_var_name) |