kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1081

Browse source 
aa9a645 cmake: remove redundant checks around CMAKE_{AR,RANLIB} (redfish)
This commit is contained in:
Riccardo Spagni 2016-09-17 07:49:03 +02:00
parent a1e6fb8243 aa9a64556d
commit 2846d0850d
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -497,17 +497,11 @@ 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)
# When invoking cmake on distributions on which gcc's binaries are prefix # When invoking cmake on distributions on which gcc's binaries are prefixed
# with an arch-specific triplet, the user has to either specify # with an arch-specific triplet, the user must specify -DCHOST=<prefix>
# -DCHOST=... or -DCMAKE_AR=... and -DCMAKE_RANLIB=...
if (DEFINED CHOST) if (DEFINED CHOST)
set(CHOST_PREFIX "${CHOST}-") set(CMAKE_AR "${CHOST}-gcc-ar")
if (NOT DEFINED CMAKE_AR) set(CMAKE_RANLIB "${CHOST}-gcc-ranlib")
set(CMAKE_AR "${CHOST_PREFIX}gcc-ar")
endif()
if (NOT DEFINED CMAKE_RANLIB)
set(CMAKE_RANLIB "${CHOST_PREFIX}gcc-ranlib")
endif()
else() else()
set(CMAKE_AR "gcc-ar") set(CMAKE_AR "gcc-ar")
set(CMAKE_RANLIB "gcc-ranlib") set(CMAKE_RANLIB "gcc-ranlib")