summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2024-01-04 21:16:47 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2024-01-05 10:59:09 +0100
commit4c2243cd597cb323e31e42ed7d51e65edca7e03d (patch)
tree201e8e0a324939cff007f6e50ce432a9093dac5a /external
parentc458bfe2cc7f03b3e73be46cec3aba9e14b0f3df (diff)
argon2: build opt.c again for WNT X86_64
Commit 401e9408d14dc2b9d07183a04c223831a59f71a3 replaced opt.c with ref.c also for X86_64, which was probably not intended; apply patch only when needed. Change-Id: Ie7ca7b88751fb2d7de4d1a27e81c7f60a98359f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161629 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
-rw-r--r--external/argon2/UnpackedTarball_argon2.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/argon2/UnpackedTarball_argon2.mk b/external/argon2/UnpackedTarball_argon2.mk
index 3addfad639d5..a91d3d6651c4 100644
--- a/external/argon2/UnpackedTarball_argon2.mk
+++ b/external/argon2/UnpackedTarball_argon2.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,argon2,1))
$(eval $(call gb_UnpackedTarball_add_patches,argon2,\
external/argon2/0001-Fix-possible-compiler-error-due-to-undefined-_MSC_VE.patch \
- external/argon2/0002-Add-WinARM64-vcxproj-config.patch \
+ $(if $(filter WNT_AARCH64,$(OS)_$(CPUNAME)),external/argon2/0002-Add-WinARM64-vcxproj-config.patch) \
))
# vim: set noet sw=4 ts=4: