1 files changed, 13 insertions, 4 deletions

diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake
index 753dca1..559788f 100644
--- a/cmake/scripts/common/PrepareEnv.cmake
+++ b/cmake/scripts/common/PrepareEnv.cmake
@@ -34,6 +34,14 @@ endif()
 
 set(PLATFORM_TAG ${CORE_SYSTEM_NAME})
 
+# The CPU variable is given either by ./tools/depends or by the
+# ./cmake/scripts/common/ArchSetup.cmake (which refers to the Kodi building
+# itself). However, this file is only used by addons, so CPU can not always
+# be defined, so in this case, if empty, the base CPU will be used.
+if(NOT CPU)
+  set(CPU ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
 if(CORE_SYSTEM_NAME STREQUAL android)
   if (CPU MATCHES "v7a")
     set(PLATFORM_TAG ${PLATFORM_TAG}-armv7)
@@ -41,13 +49,14 @@ if(CORE_SYSTEM_NAME STREQUAL android)
     set(PLATFORM_TAG ${PLATFORM_TAG}-aarch64)
   elseif (CPU MATCHES "i686")
     set(PLATFORM_TAG ${PLATFORM_TAG}-i686)
+  elseif (CPU MATCHES "x86_64")
+    set(PLATFORM_TAG ${PLATFORM_TAG}-x86_64)
   else()
     message(FATAL_ERROR "Unsupported architecture")
   endif()
-elseif(CORE_SYSTEM_NAME STREQUAL ios)
-  if (CPU MATCHES armv7)
-    set(PLATFORM_TAG ${PLATFORM_TAG}-armv7)
-  elseif (CPU MATCHES arm64)
+elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+  set(PLATFORM_TAG ${CORE_PLATFORM_NAME})
+  if (CPU MATCHES arm64)
     set(PLATFORM_TAG ${PLATFORM_TAG}-aarch64)
   else()
     message(FATAL_ERROR "Unsupported architecture")