diff options
| author | ADAM David Alan Martin <adam.martin@10gen.com> | 2017-04-24 18:06:53 -0400 |
|---|---|---|
| committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2017-04-24 19:12:49 -0400 |
| commit | cf8538613048ab9c9345214a19c70e4fd9c71db9 (patch) | |
| tree | ac11f6a727416a4ef87289ae62526e7c0ae1f007 /src/mongo/db/ops/SConscript | |
| parent | d6b244fce44e6729485b1521346db6e372f6b901 (diff) | |
| download | mongo-cf8538613048ab9c9345214a19c70e4fd9c71db9.tar.gz | |
SERVER-28851 Resolve cycles from latest vtables.
The introduction of several vtables lets us resolve a few more
cyclic dependencies into `mongo/db/catalog/catalog`. Fully
resolved libraries have had their libdeps checking exemptions
removed.
Diffstat (limited to 'src/mongo/db/ops/SConscript')
| -rw-r--r-- | src/mongo/db/ops/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index de8e3b27176..4255d077aa9 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -197,6 +197,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/catalog/collection_info_cache', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/matcher/expressions_mongod_only', '$BUILD_DIR/mongo/db/query/query', @@ -206,11 +207,10 @@ env.Library( '$BUILD_DIR/mongo/db/update/update_driver', '$BUILD_DIR/mongo/db/introspect', '$BUILD_DIR/mongo/db/curop_metrics', - #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE #'$BUILD_DIR/mongo/db/commands/dcommands', # CYCLE ], LIBDEPS_TAGS=[ - # TODO(ADAM, 2017-01-10): See `CYCLE` tags above. + # TODO(ADAM, 2017-04-18): See `CYCLE` tags above. 'illegal_cyclic_or_unresolved_dependencies_whitelisted', ], ) |