Merge pull request #1065

1855213 Attempt to fix broken compilation on some systems caused by #1074 (iDunk5400)
This commit is contained in:
Riccardo Spagni 2016-09-15 15:18:21 +02:00
commit 23d99930b8
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -502,13 +502,16 @@ else()
# -DCHOST=... or -DCMAKE_AR=... and -DCMAKE_RANLIB=... # -DCHOST=... or -DCMAKE_AR=... and -DCMAKE_RANLIB=...
if (DEFINED CHOST) if (DEFINED CHOST)
set(CHOST_PREFIX "${CHOST}-") set(CHOST_PREFIX "${CHOST}-")
endif()
if (NOT DEFINED CMAKE_AR) if (NOT DEFINED CMAKE_AR)
set(CMAKE_AR "${CHOST_PREFIX}gcc-ar") set(CMAKE_AR "${CHOST_PREFIX}gcc-ar")
endif() endif()
if (NOT DEFINED CMAKE_RANLIB) if (NOT DEFINED CMAKE_RANLIB)
set(CMAKE_RANLIB "${CHOST_PREFIX}gcc-ranlib") set(CMAKE_RANLIB "${CHOST_PREFIX}gcc-ranlib")
endif() endif()
else()
set(CMAKE_AR "gcc-ar")
set(CMAKE_RANLIB "gcc-ranlib")
endif()
endif() endif()
endif() endif()