Merge pull request #1047

0f94f61 cmake: handle dists which prefix gcc binaries wth arch triplet (redfish)
This commit is contained in:
Riccardo Spagni 2016-09-10 15:11:16 +02:00
commit 1d0578f8d3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -497,8 +497,18 @@ else()
endif() endif()
# Since gcc 4.9 the LTO format is non-standard (slim), so we need the gcc-specific ar and ranlib binaries # 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 OPENBSD) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT OPENBSD)
set(CMAKE_AR "gcc-ar") # When invoking cmake on distributions on which gcc's binaries are prefix
set(CMAKE_RANLIB "gcc-ranlib") # with an arch-specific triplet, the user has to either specify
# -DCHOST=... or -DCMAKE_AR=... and -DCMAKE_RANLIB=...
if (DEFINED CHOST)
set(CHOST_PREFIX "${CHOST}-")
endif()
if (NOT DEFINED CMAKE_AR)
set(CMAKE_AR "${CHOST_PREFIX}gcc-ar")
endif()
if (NOT DEFINED CMAKE_RANLIB)
set(CMAKE_RANLIB "${CHOST_PREFIX}gcc-ranlib")
endif()
endif() endif()
endif() endif()