diff options
| author | Andrew Morrow <acm@mongodb.com> | 2022-03-28 14:11:17 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-28 22:47:49 +0000 |
| commit | 51918a385ab8b3fc1f922bede326ff84e846a47b (patch) | |
| tree | eb7c53e3cb86c2deb7660ab5a2cefdb04fed4bff /src/third_party/SConscript | |
| parent | fcf8de14cb92fb4ff5874308104ca942ea11b655 (diff) | |
| download | mongo-51918a385ab8b3fc1f922bede326ff84e846a47b.tar.gz | |
SERVER-61305 Disallow --use-system-abseil-cpp
Diffstat (limited to 'src/third_party/SConscript')
| -rw-r--r-- | src/third_party/SConscript | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index c8b4716b124..5b80a856e50 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -17,6 +17,9 @@ tomcryptSuffix = '-1.18.2' variantSuffix = '-1.4.0' thirdPartyEnvironmentModifications = { + 'abseil-cpp' : { + 'CPPPATH' : ['#/src/third_party/abseil-cpp-master/abseil-cpp'], + }, 'fmt' : { 'CPPPATH' : ['#src/third_party/fmt/dist/include'], }, @@ -101,11 +104,6 @@ if not use_system_version_of_library('boost'): 'CCFLAGS' : ['$NOERROR_FOR_UNKNOWN_WARNING_OPTION_GEN'] if env.ToolchainIs('clang') else [] } -if not use_system_version_of_library('abseil-cpp'): - thirdPartyEnvironmentModifications['abseil-cpp'] = { - 'CPPPATH' : ['#/src/third_party/abseil-cpp-master/abseil-cpp'], - } - if not use_system_version_of_library('snappy'): thirdPartyEnvironmentModifications['snappy'] = { 'CPPPATH' : ['#/src/third_party/snappy' + snappySuffix], @@ -373,25 +371,16 @@ else: boostEnv.ShimLibrary(name="boost") +abseilDirectory = 'abseil-cpp-master' abseilEnv = env.Clone() -if use_system_version_of_library("abseil-cpp"): - abseilEnv = abseilEnv.Clone( - SYSLIBDEPS=[ - env['LIBDEPS_ABSL_CONTAINER_SYSLIBDEP'], - env['LIBDEPS_ABSL_HASH_SYSLIBDEP'], - env['LIBDEPS_ABSL_NUMERIC_SYSLIBDEP'], - ]) -else: - abseilDirectory = 'abseil-cpp-master' - abseilEnv = abseilEnv.Clone() - abseilEnv.InjectThirdParty(libraries=['abseil-cpp']) - abseilEnv.SConscript(abseilDirectory + '/SConscript', exports={ 'env' : abseilEnv }) - abseilEnv = abseilEnv.Clone( - LIBDEPS_INTERFACE=[ - abseilDirectory + '/absl_container', - abseilDirectory + '/absl_hash', - abseilDirectory + '/absl_numeric', - ]) +abseilEnv.InjectThirdParty(libraries=['abseil-cpp']) +abseilEnv.SConscript(abseilDirectory + '/SConscript', exports={ 'env' : abseilEnv }) +abseilEnv = abseilEnv.Clone( + LIBDEPS_INTERFACE=[ + abseilDirectory + '/absl_container', + abseilDirectory + '/absl_hash', + abseilDirectory + '/absl_numeric', + ]) abseilEnv.ShimLibrary(name="abseil") |