From d2bdf6868f0d491c61b56ede4c45e82b5f4de990 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Thu, 14 Oct 2021 10:40:21 +0100 Subject: [PATCH 1/2] Revert "Fix for https://github.com/Exiv2/exiv2/issues/1856" This reverts commit e6673465823a053eb1bf9dcb19ee93b56a704c79. --- cmake/compilerFlags.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake index 6391cfe1e6..f81cc2e6c8 100644 --- a/cmake/compilerFlags.cmake +++ b/cmake/compilerFlags.cmake @@ -31,12 +31,10 @@ 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 and macOS/M1 + # This fails under Fedora - MinGW - Gcc 8.3 if (NOT (MINGW OR CYGWIN OR CMAKE_HOST_SOLARIS)) - # 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) + if (NOT APPLE) # Don't know why this isn't working correctly on Apple with M1 processor + 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) From cf6566b13cdc0f710b58dc29c564cc4248186c97 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Fri, 15 Oct 2021 16:53:53 +0100 Subject: [PATCH 2/2] Fix indentation --- cmake/compilerFlags.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake index f81cc2e6c8..15e936264a 100644 --- a/cmake/compilerFlags.cmake +++ b/cmake/compilerFlags.cmake @@ -34,7 +34,7 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN # This fails under Fedora - MinGW - Gcc 8.3 if (NOT (MINGW OR CYGWIN OR CMAKE_HOST_SOLARIS)) if (NOT APPLE) # Don't know why this isn't working correctly on Apple with M1 processor - check_cxx_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION) + 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)