diff options
| author | Andrew Morrow <acm@mongodb.com> | 2021-08-10 13:57:18 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-08-18 00:53:37 +0000 |
| commit | b7aeb64343266da73e29632ef96ebfad5df91495 (patch) | |
| tree | e7b9c7f841c1fa4d160db9bec1577f46ebd6d8bf /site_scons | |
| parent | 61619013017ff0b6ef5f12cebb4a67246dbb4ffb (diff) | |
| download | mongo-b7aeb64343266da73e29632ef96ebfad5df91495.tar.gz | |
SERVER-54487 Third-party shim libraries do not need to be linked to or installed
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/libdeps.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/site_scons/libdeps.py b/site_scons/libdeps.py index ddf1bc93631..1b58934e581 100644 --- a/site_scons/libdeps.py +++ b/site_scons/libdeps.py @@ -730,7 +730,13 @@ def _libdeps_visit(n, tsorted, marked, walking, debug=False): _libdeps_visit_private(child, marked, walking, debug) marked[n.target_node] = LibdepsVisitationMark.MARKED_PUBLIC - tsorted.append(n.target_node) + + # If the node has been marked as a virtual libdep in the tags, + # we don't add it to tsorted because it isn't a real + # dependency, just a node that adds further transitive + # dependencies. + if not 'virtual-libdep' in n.target_node.get_env().get('LIBDEPS_TAGS', []): + tsorted.append(n.target_node) except DependencyCycleError as e: if len(e.cycle_nodes) == 1 or e.cycle_nodes[0] != e.cycle_nodes[-1]: |