aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-09-15 15:18:21 +0200
committerRiccardo Spagni <ric@spagni.net>2016-09-15 15:18:21 +0200
commit23d99930b8e7021ae3d5e3c5181f0072f1f345f9 (patch)
treecf06498f6f76a4f724e704367ad0a4751dcf8cc7
parentMerge pull request #1053 (diff)
parentAttempt to fix broken compilation on some systems caused by #1074 (diff)
downloadmonero-23d99930b8e7021ae3d5e3c5181f0072f1f345f9.tar.xz
Merge pull request #1065
1855213 Attempt to fix broken compilation on some systems caused by #1074 (iDunk5400)
-rw-r--r--CMakeLists.txt15
1 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b0ce5a4e..1f6c9f8d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -502,12 +502,15 @@ else()
# -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")
+ 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()
+ else()
+ set(CMAKE_AR "gcc-ar")
+ set(CMAKE_RANLIB "gcc-ranlib")
endif()
endif()
endif()