Fix build issue on Apple M1 with AppleClang

- Currently catch2 is header directly added in the project - Before switching to submodule (in separate PR), copying minimal fix from the upstream: catchorg/Catch2#1971 - Update INSTALL.md for Apple M1 Fixes #527
BlueBrain · Mar 5, 2021 · 6359fea · 6359fea
1 parent 6e81fe5
commit 6359fea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/INSTALL.md b/INSTALL.md
@@ -46,6 +46,12 @@ Make sure to have latest flex/bison in $PATH :
 export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:/usr/local/bin/:$PATH
 ```
 
+On Apple M1, corresponding brew paths are under `/opt/homebrew/opt/`:
+
+```sh
+export PATH=/opt/homebrew/opt/flex/bin:/opt/homebrew/opt/bison/bin:$PATH
+```
+
 ### On Ubuntu
 
 On Ubuntu (>=16.04) flex/bison versions are recent enough and are installed along with the system toolchain:

diff --git a/ext/catch/catch.hpp b/ext/catch/catch.hpp
@@ -1368,7 +1368,11 @@ namespace Catch {
 
 #ifdef CATCH_PLATFORM_MAC
 
-    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
 
 #elif defined(CATCH_PLATFORM_LINUX)
     // If we can use inline assembler, do it because this allows us to break