Skip to content

Commit

Permalink
SERVER-50167 Upgrade gperftools to v2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Egesdahl authored and Evergreen Agent committed Aug 13, 2020
1 parent 3d2c296 commit 6161c02
Show file tree
Hide file tree
Showing 448 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.third_party.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ a notice will be included in
| [benchmark] | Apache-2.0 | 1.5.1 | 1.5.0 | | |
| [Boost] | BSL-1.0 | 1.73.0 | 1.70.0 | ||
| [fmt] | BSD-2-Clause | 6.2.1 | 6.1.1 | ||
| [GPerfTools] | BSD-3-Clause | 2.7.90 | 2.7 | ||
| [GPerfTools] | BSD-3-Clause | 2.8 | 2.8 | ||
| [ICU4] | ICU | 67.1 | 57.1 |||
| [Intel Decimal FP Library] | BSD-3-Clause | 2.0 Update 2 | 2.0 Update 1 | ||
| [JSON-Schema-Test-Suite] | MIT | | 728066f9c5 | | |
Expand Down
5 changes: 2 additions & 3 deletions src/third_party/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ pcreSuffix = "-8.42"
mozjsSuffix = '-60'
yamlSuffix = '-0.6.2'
icuSuffix = '-57.1'
gperftoolsSuffix = '-2.7'
timelibSuffix = '-2018.01'
tomcryptSuffix = '-1.18.2'
variantSuffix = '-1.4.0'
Expand Down Expand Up @@ -531,11 +530,11 @@ if gperftoolsEnv['MONGO_ALLOCATOR'] in ["tcmalloc", "tcmalloc-experimental"]:
thirdPartyEnvironmentModifications['gperftools'][k] = v
gperftoolsEnv.AddMethod(registerConsumerModifications, 'RegisterConsumerModifications')
gperftoolsEnv.SConscript(
'gperftools' + gperftoolsSuffix + '/SConscript',
'gperftools' + '/SConscript',
exports={'env' : gperftoolsEnv})
gperftoolsEnv = gperftoolsEnv.Clone(
LIBDEPS_INTERFACE=[
'gperftools' + gperftoolsSuffix + '/tcmalloc_minimal',
'gperftools/tcmalloc_minimal',
])

gperftoolsEnv.Library(
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ if not debugBuild:
if (not debugBuild) or (not env['TARGET_ARCH'] in ['x86_64', 'i386']):
env.Append(CPPDEFINES=["NO_TCMALLOC_SAMPLES"])

gperftools_root = env.Dir("#/src/third_party/gperftools-2.7")
gperftools_root = env.Dir("#/src/third_party/gperftools")
gperftools_platform = gperftools_root.Dir("platform/${TARGET_OS}_${TARGET_ARCH}")

env.Append(CPPPATH=[gperftools_platform.Dir("internal/src"),
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 6161c02

Please sign in to comment.