From 030d152d15dcedb61f764395bc90ba90f7b17085 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Sat, 7 Aug 2021 16:57:40 +0100 Subject: [PATCH] Fix for https://github.com/Exiv2/exiv2/issues/1856 --- cmake/compilerFlags.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake index 35faf5010f..1cb4923ebe 100644 --- a/cmake/compilerFlags.cmake +++ b/cmake/compilerFlags.cmake @@ -23,9 +23,13 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN if (COMPILER_IS_GCC OR COMPILER_IS_CLANG) - # This fails under Fedora - MinGW - Gcc 8.3 + # This fails under Fedora - MinGW - Gcc 8.3 and macOS/M1 if (NOT (MINGW OR CYGWIN OR CMAKE_HOST_SOLARIS)) - check_cxx_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION) + # macOS M1 will set ARCHITECTURE == arm64 + EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE ) + if ( NOT ${ARCHITECTURE} STREQUAL arm64 ) + check_cxx_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION) + endif() check_cxx_compiler_flag(-fcf-protection HAS_FCF_PROTECTION) check_cxx_compiler_flag(-fstack-protector-strong HAS_FSTACK_PROTECTOR_STRONG) if(HAS_FSTACK_CLASH_PROTECTION)