diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2024-01-04 21:16:47 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2024-01-05 19:04:15 +0100 |
| commit | 08b118519da8245ca67279f2b23304ab657bd7e0 (patch) | |
| tree | 4777ae8ab9cf4b34c4eb0bae0e2338125fac2c0f /external | |
| parent | aa93c77c360f1b1e60baa3af556976f697147005 (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>
(cherry picked from commit 4c2243cd597cb323e31e42ed7d51e65edca7e03d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161640
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/argon2/UnpackedTarball_argon2.mk | 2 |
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: |