diff options
| author | Yu Jin Kang Park <yujin.kang@mongodb.com> | 2022-06-03 13:38:17 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-03 14:25:20 +0000 |
| commit | d5f2b25b63605b822e1ae032d7ca9ee32d5476e6 (patch) | |
| tree | 50a15fa4fb521aa515da7e24835704e8dbf2a1f3 /src/third_party/SConscript | |
| parent | 9d4269ae547bfc5a645e88566119c12c4fa8d714 (diff) | |
| download | mongo-d5f2b25b63605b822e1ae032d7ca9ee32d5476e6.tar.gz | |
SERVER-66122: Upgrage zlib to 1.2.12
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 07dee011853..af08535b963 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -14,7 +14,6 @@ Import([ ]) snappySuffix = '-1.1.7' -zlibSuffix = '-1.2.11' pcreSuffix = "-8.42" icuSuffix = '-57.1' timelibSuffix = '-2021.06' @@ -112,7 +111,7 @@ if not use_system_version_of_library('valgrind'): if not use_system_version_of_library('zlib'): thirdPartyEnvironmentModifications['zlib'] = { - 'CPPPATH': ['#/src/third_party/zlib' + zlibSuffix], + 'CPPPATH': ['#/src/third_party/zlib'], } if not use_system_version_of_library('zstd'): @@ -409,9 +408,9 @@ if use_system_version_of_library("zlib"): else: zlibEnv = zlibEnv.Clone() zlibEnv.InjectThirdParty(libraries=['zlib']) - zlibEnv.SConscript('zlib' + zlibSuffix + '/SConscript', exports={'env': zlibEnv}) + zlibEnv.SConscript('zlib' + '/SConscript', exports={'env': zlibEnv}) zlibEnv = zlibEnv.Clone(LIBDEPS_INTERFACE=[ - 'zlib' + zlibSuffix + '/zlib', + 'zlib/zlib', ]) zlibEnv.ShimLibrary(name="zlib", ) |