diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-17 07:49:03 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-17 07:49:03 +0200 |
| commit | 2846d0850d6e92d38c44eac9e6a4fca6b1545453 (patch) | |
| tree | 431205627307fd615ba8ace36d8a41a9522e43d1 | |
| parent | Merge pull request #1080 (diff) | |
| parent | cmake: remove redundant checks around CMAKE_{AR,RANLIB} (diff) | |
| download | monero-2846d0850d6e92d38c44eac9e6a4fca6b1545453.tar.xz | |
Merge pull request #1081
aa9a645 cmake: remove redundant checks around CMAKE_{AR,RANLIB} (redfish)
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f6c9f8d0..0c813b867 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,17 +497,11 @@ 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 OPENBSD) - # When invoking cmake on distributions on which gcc's binaries are prefix - # with an arch-specific triplet, the user has to either specify - # -DCHOST=... or -DCMAKE_AR=... and -DCMAKE_RANLIB=... + # When invoking cmake on distributions on which gcc's binaries are prefixed + # with an arch-specific triplet, the user must specify -DCHOST=<prefix> if (DEFINED CHOST) - set(CHOST_PREFIX "${CHOST}-") - 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() + set(CMAKE_AR "${CHOST}-gcc-ar") + set(CMAKE_RANLIB "${CHOST}-gcc-ranlib") else() set(CMAKE_AR "gcc-ar") set(CMAKE_RANLIB "gcc-ranlib") |