diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2020-05-04 04:52:56 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-09 17:27:43 +0000 |
| commit | cbfc03979e1b567eb58a5d4bb6d8bbcd65988775 (patch) | |
| tree | d7933d5a2bf6f04e15f4cf21d3e772680e84b8b2 /src/third_party/SConscript | |
| parent | c4cebb3de7d11aa8f73df45f417e3be712bcf215 (diff) | |
| download | mongo-cbfc03979e1b567eb58a5d4bb6d8bbcd65988775.tar.gz | |
SERVER-41567 Upgrade google-benchmark to tag mongo-v1.5.0
Diffstat (limited to 'src/third_party/SConscript')
| -rw-r--r-- | src/third_party/SConscript | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 9e80376fb15..86a36df7670 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -22,7 +22,6 @@ icuSuffix = '-57.1' gperftoolsSuffix = '-2.7' timelibSuffix = '-2018.01' tomcryptSuffix = '-1.18.2' -benchmarkSuffix = '-1.4.1' thirdPartyEnvironmentModifications = { 'fmt' : { @@ -123,7 +122,7 @@ if not use_system_version_of_library('zstd'): if not use_system_version_of_library('google-benchmark'): thirdPartyEnvironmentModifications['benchmark'] = { - 'CPPPATH' : ['#/src/third_party/benchmark' + benchmarkSuffix + '/benchmark/include'], + 'CPPPATH' : ['#/src/third_party/benchmark/dist/include'], } # TODO: figure out if we want to offer system versions of mozjs. Mozilla @@ -466,11 +465,11 @@ else: benchmarkEnv = env.Clone() benchmarkEnv.InjectThirdParty(libraries=['benchmark']) benchmarkEnv.SConscript( - 'benchmark' + benchmarkSuffix + '/SConscript', + 'benchmark/SConscript', exports={ 'env' : benchmarkEnv }) benchmarkEnv = benchmarkEnv.Clone( LIBDEPS_INTERFACE=[ - 'benchmark' + benchmarkSuffix + '/benchmark', + 'benchmark/benchmark', ]) benchmarkEnv.Library( |