summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-06-28 19:13:17 +0200
committerGitHub <noreply@github.com>2022-06-28 19:13:17 +0200
commit8cd6127cb8905485f6e27f6e3760df78fb227aa4 (patch)
tree9016424e7553ca4ff930714dd5602db9b6bf15a0 /core
parent622b656c40f9d8d9c8fdd45d6727f416952636d7 (diff)
parent39ed39900e34e10f40d0d06ed358d2641d7f3315 (diff)
Merge pull request #59167 from akien-mga/zstd-1.5.2
zstd: Update to upstream version 1.5.2
Diffstat (limited to 'core')
-rw-r--r--core/SCsub4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/SCsub b/core/SCsub
index 1379e9df9b..3814c72877 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -129,6 +129,10 @@ if env["builtin_zstd"]:
"decompress/zstd_decompress_block.c",
"decompress/zstd_decompress.c",
]
+ if env["platform"] in ["android", "linuxbsd", "osx"]:
+ # Match platforms with ZSTD_ASM_SUPPORTED in common/portability_macros.h
+ # iOS x86_64 should be supported in theory, but it fails arm64 build, seems to use host S_compiler.
+ thirdparty_zstd_sources.append("decompress/huf_decompress_amd64.S")
thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])