Merge pull request #1065

1855213 Attempt to fix broken compilation on some systems caused by #1074 (iDunk5400)

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()