commit 664a449c5d093bf96064c7743e73a4b2c98e8a31
author Raef Coles <raef.coles@arm.com> Mon Dec 07 13:57:58 2020 +0000
committer Raef Coles <raef.coles@arm.com> Mon Dec 14 09:30:39 2020 +0000
tree 3e8eaa3c7c1cd891b6fcc59dcc5992a69e656e0c
parent d79895b3b92cbd8baabbdbc82759704e2d0571d1

Build: Switch mbedtls auto-patching to git am

To avoid occasional CRLF issues with certain windows git config

Change-Id: I97529d1724ecb75e1bf9d50872e513cd3c502ff2
Signed-off-by: Raef Coles <raef.coles@arm.com>

lib/ext/mbedcrypto/CMakeLists.txt

diff --git a/lib/ext/mbedcrypto/CMakeLists.txt b/lib/ext/mbedcrypto/CMakeLists.txt
index 79adce1..7a28ef5 100644
--- a/lib/ext/mbedcrypto/CMakeLists.txt
+++ b/lib/ext/mbedcrypto/CMakeLists.txt
@@ -24,7 +24,7 @@
             GIT_SHALLOW TRUE
             GIT_PROGRESS TRUE
             GIT_SUBMODULES ""
-            PATCH_COMMAND ${GIT_EXECUTABLE} apply ${PATCH_FILES}
+            PATCH_COMMAND ${GIT_EXECUTABLE} am ${PATCH_FILES}
         )
     else()
         FetchContent_Declare(mbedcrypto