From e0f78c3dc2233a0c7b124707af6350669be81f18 Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 26 Feb 2020 16:07:35 +0300 Subject: [PATCH] fixed build for gcc 5.4.0 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91ddf2a6..f710955e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,13 +107,13 @@ else() endif() # Since gcc 4.9 the LTO format is non-standard (slim), so we need the gcc-specific ar and ranlib binaries - ##if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT (MAKE_SYSTEM_NAME STREQUAL "Android")) - ## set(CMAKE_AR "gcc-ar") - ## set(CMAKE_RANLIB "gcc-ranlib") - ##elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE AND NOT (MAKE_SYSTEM_NAME STREQUAL "Android")) - ## set(CMAKE_AR "llvm-ar") - ## set(CMAKE_RANLIB "llvm-ranlib") - ##endif() + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Android")) + set(CMAKE_AR "gcc-ar") + set(CMAKE_RANLIB "gcc-ranlib") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Android")) + set(CMAKE_AR "llvm-ar") + set(CMAKE_RANLIB "llvm-ranlib") + endif() if(MINGW)