diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-08-17 15:00:39 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-08-17 17:46:04 -0400 |
| commit | 7b5a6c25c0ac0aee0b1ab31d15af233096f3dd5b (patch) | |
| tree | 55748e81c13b4d6ad8bd9148cb57ca88d83e36a2 /site_scons | |
| parent | 86f8af9d40b294852399097daf80894e28c20adc (diff) | |
| download | mongo-7b5a6c25c0ac0aee0b1ab31d15af233096f3dd5b.tar.gz | |
SERVER-30661 Ignore non-truthy libdeps entries
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/libdeps.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/site_scons/libdeps.py b/site_scons/libdeps.py index 61d608da510..7bf5ff19a33 100644 --- a/site_scons/libdeps.py +++ b/site_scons/libdeps.py @@ -244,9 +244,9 @@ def libdeps_emitter(target, source, env): prog_builder = env['BUILDERS']['Program'] prog_node_factory = prog_builder.target_factory or env.File - prereqs = [dependency(l, False, dependency.Public) for l in env.get(libdeps_env_var, [])] - prereqs.extend(dependency(l, False, dependency.Interface) for l in env.get(libdeps_env_var + '_INTERFACE', [])) - prereqs.extend(dependency(l, False, dependency.Private) for l in env.get(libdeps_env_var + '_PRIVATE', [])) + prereqs = [dependency(l, False, dependency.Public) for l in env.get(libdeps_env_var, []) if l] + prereqs.extend(dependency(l, False, dependency.Interface) for l in env.get(libdeps_env_var + '_INTERFACE', []) if l) + prereqs.extend(dependency(l, False, dependency.Private) for l in env.get(libdeps_env_var + '_PRIVATE', []) if l) for prereq in prereqs: prereqWithIxes = SCons.Util.adjustixes( @@ -300,9 +300,9 @@ def shlibdeps_emitter(target, source, env): prog_builder = env['BUILDERS']['Program'] prog_node_factory = prog_builder.target_factory or env.File - prereqs = [dependency(l, True, dependency.Public) for l in env.get(libdeps_env_var, [])] - prereqs.extend(dependency(l, True, dependency.Interface) for l in env.get(libdeps_env_var + '_INTERFACE', [])) - prereqs.extend(dependency(l, True, dependency.Private) for l in env.get(libdeps_env_var + '_PRIVATE', [])) + prereqs = [dependency(l, True, dependency.Public) for l in env.get(libdeps_env_var, []) if l] + prereqs.extend(dependency(l, True, dependency.Interface) for l in env.get(libdeps_env_var + '_INTERFACE', []) if l) + prereqs.extend(dependency(l, True, dependency.Private) for l in env.get(libdeps_env_var + '_PRIVATE', []) if l) for prereq in prereqs: prereqWithIxes = SCons.Util.adjustixes( |