diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2022-03-03 19:07:56 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-03 19:35:38 +0000 |
| commit | 31ab81e3b975433e36ea29e2071bd7d28392cda8 (patch) | |
| tree | f1dee6cd7c6d4404e8dc7446d9a81263253955c2 /src/third_party | |
| parent | 99f54b122372e49dcaea2249cac8edc1af768bcc (diff) | |
| download | mongo-31ab81e3b975433e36ea29e2071bd7d28392cda8.tar.gz | |
SERVER-63041 Add ASFLAGS on the command line for macos variables files to control.
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/zstandard/SConscript | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/third_party/zstandard/SConscript b/src/third_party/zstandard/SConscript index 1a6b2753f38..a16bef4a13a 100644 --- a/src/third_party/zstandard/SConscript +++ b/src/third_party/zstandard/SConscript @@ -9,9 +9,6 @@ env.Prepend(CPPPATH=[ 'zstd/lib/common', ]) -if env.TargetOSIs('macOS'): - env.AppendUnique(CPPDEFINES=['ZSTD_DISABLE_ASM']) - env.Library( target="zstd", source=[ @@ -36,7 +33,7 @@ env.Library( 'zstd/lib/compress/zstd_opt.c', 'zstd/lib/compress/zstdmt_compress.c', 'zstd/lib/decompress/huf_decompress.c', - 'zstd/lib/decompress/huf_decompress_amd64.S' if not env.TargetOSIs('windows') and not env.TargetOSIs('macOS') else [], + 'zstd/lib/decompress/huf_decompress_amd64.S' if not env.TargetOSIs('windows') else [], 'zstd/lib/decompress/zstd_ddict.c', 'zstd/lib/decompress/zstd_decompress.c', 'zstd/lib/decompress/zstd_decompress_block.c', @@ -47,7 +44,7 @@ env.Library( 'zstd/lib/dictBuilder/divsufsort.c', 'zstd/lib/dictBuilder/fastcover.c', 'zstd/lib/dictBuilder/zdict.c', - + ], LIBDEPS_TAGS=[ 'init-no-global-side-effects', |