From eea7dbc888367b8dbea602ba539eb1a9cbc118d9 Mon Sep 17 00:00:00 2001 From: Alexey Zaparovanny Date: Mon, 2 Sep 2019 07:50:39 -0400 Subject: [PATCH 1/2] Do not use -m64/-m32 flags on aarch64 system, gcc 7 does not support this flags on arm64 platform --- src/CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f0a7b26b..e19a8e77 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -214,14 +214,17 @@ elseif( CMAKE_COMPILER_IS_GNUCXX ) add_definitions( "/D_DEBUG" ) endif( ) - if( BUILD64 ) - set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" ) + if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") + message("AARCH64 GCC does not support -m64/-m32. Not using it.") else( ) - set( CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) + if( BUILD64 ) + set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" ) + else( ) + set( CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) + endif( ) endif( ) - if( CODE_COVERAGE ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage" ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage" ) From a530695606df295eebc4668aa00d76e8f74a59a5 Mon Sep 17 00:00:00 2001 From: Alexey Zaparovanny Date: Mon, 2 Sep 2019 07:53:21 -0400 Subject: [PATCH 2/2] Restored code formatting --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e19a8e77..930d6180 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -225,6 +225,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX ) set( CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) endif( ) endif( ) + if( CODE_COVERAGE ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage" ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage" )