diff options
| author | ADAM David Alan Martin <adam.martin@10gen.com> | 2017-01-17 14:40:56 -0500 |
|---|---|---|
| committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2017-01-17 14:44:05 -0500 |
| commit | eb71198dbd1b51ea9653cf58c3e1fc2f9cbce4fb (patch) | |
| tree | 374edb3cc214f79019983e8fc21090f3eb8afd52 /SConstruct | |
| parent | fdec6ed545c0045646c7cca33eb4094385bc9429 (diff) | |
| download | mongo-eb71198dbd1b51ea9653cf58c3e1fc2f9cbce4fb.tar.gz | |
SERVER-27709 Remove cycles & change incomplete tag
Allow `incomplete` for the time being to prevent breaking code in
enterprise. The cycle/incomplete exemption has been renamed to
`illegal_cyclic_or_unresolved_dependencies_whitelisted`, to discourage
overuse. Removed the incompletes that we can.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 40dbd800b37..7ca35c2fe06 100644 --- a/SConstruct +++ b/SConstruct @@ -1283,7 +1283,9 @@ if link_model.startswith("dynamic"): def libdeps_tags_expand_incomplete(source, target, env, for_signature): # On darwin, since it is strict by default, we need to add a flag # when libraries are tagged incomplete. - if 'incomplete' in target[0].get_env().get("LIBDEPS_TAGS", []): + if ('illegal_cyclic_or_unresolved_dependencies_whitelisted' + in target[0].get_env().get("LIBDEPS_TAGS", []) or + 'incomplete' in target[0].get_env().get("LIBDEPS_TAGS", [])): return ["-Wl,-undefined,dynamic_lookup"] return [] env['LIBDEPS_TAG_EXPANSIONS'].append(libdeps_tags_expand_incomplete) @@ -1300,7 +1302,9 @@ if link_model.startswith("dynamic"): # default, we need to add a flag when libraries are not # tagged incomplete. def libdeps_tags_expand_incomplete(source, target, env, for_signature): - if 'incomplete' not in target[0].get_env().get("LIBDEPS_TAGS", []): + if ('illegal_cyclic_or_unresolved_dependencies_whitelisted' + not in target[0].get_env().get("LIBDEPS_TAGS", []) and + 'incomplete' not in target[0].get_env().get("LIBDEPS_TAGS", [])): return ["-Wl,-z,defs"] return [] env['LIBDEPS_TAG_EXPANSIONS'].append(libdeps_tags_expand_incomplete) |