diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-03-22 19:10:06 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-07-21 11:25:20 -0400 |
| commit | bb2f68f8c42c7649b33b4b3855386fc954bc8fd4 (patch) | |
| tree | dcc1b829c4263366ff5ac39932028b687ab5d76b /src/third_party/s2 | |
| parent | 2a6a8f7cf32465da072e63ee9e1272907b6bfa54 (diff) | |
| download | mongo-bb2f68f8c42c7649b33b4b3855386fc954bc8fd4.tar.gz | |
SERVER-9666 Collapse the low level cyclic libs into a new base lib
Diffstat (limited to 'src/third_party/s2')
| -rwxr-xr-x | src/third_party/s2/base/SConscript | 6 | ||||
| -rwxr-xr-x | src/third_party/s2/strings/SConscript | 7 | ||||
| -rwxr-xr-x | src/third_party/s2/util/coding/SConscript | 4 | ||||
| -rwxr-xr-x | src/third_party/s2/util/math/SConscript | 4 |
4 files changed, 19 insertions, 2 deletions
diff --git a/src/third_party/s2/base/SConscript b/src/third_party/s2/base/SConscript index ddeffd6273d..c2f2b152b0c 100755 --- a/src/third_party/s2/base/SConscript +++ b/src/third_party/s2/base/SConscript @@ -13,4 +13,8 @@ env.Library( "logging.cc", "stringprintf.cc", "strtoint.cc", - ]) + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ], +) diff --git a/src/third_party/s2/strings/SConscript b/src/third_party/s2/strings/SConscript index 93eb6321c47..21b5ae7c8dc 100755 --- a/src/third_party/s2/strings/SConscript +++ b/src/third_party/s2/strings/SConscript @@ -12,4 +12,9 @@ env.Library( "split.cc", "stringprintf.cc", "strutil.cc", - ]) + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/third_party/s2/base/base', + ], +) diff --git a/src/third_party/s2/util/coding/SConscript b/src/third_party/s2/util/coding/SConscript index 91874e068a2..85141983ad7 100755 --- a/src/third_party/s2/util/coding/SConscript +++ b/src/third_party/s2/util/coding/SConscript @@ -12,4 +12,8 @@ env.Library( [ "coder.cc", "varint.cc", + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/third_party/s2/base/base', ]) diff --git a/src/third_party/s2/util/math/SConscript b/src/third_party/s2/util/math/SConscript index 865806049b9..f3fbbc32810 100755 --- a/src/third_party/s2/util/math/SConscript +++ b/src/third_party/s2/util/math/SConscript @@ -14,4 +14,8 @@ if env.TargetOSIs('solaris'): env.Library("math", [ "mathutil.cc", # "mathlimits.cc", + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/third_party/s2/base/base', ]) |