Skip to content

Commit

Permalink
Fix for Exiv2#1856
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinbackhouse committed Aug 7, 2021
1 parent a1b65a7 commit e667346
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions cmake/compilerFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ 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))
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)
# 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)
Expand Down

0 comments on commit e667346

Please sign in to comment.