From 44c5a2822181af44278ad0d95c06a80ce18fa827 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Wed, 3 Mar 2021 02:07:45 +0800
Subject: [PATCH] [TD-3148] <feature>: make build system detect host arch.
 detect amd64 and x86

---
 cmake/platform.inc | 60 +++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/cmake/platform.inc b/cmake/platform.inc
index 93bf3697d7..851857e90f 100755
--- a/cmake/platform.inc
+++ b/cmake/platform.inc
@@ -78,38 +78,48 @@ ELSE()
   EXIT ()
 ENDIF ()
 
-# if generate ARM version:
-#   cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64
-IF (${CPUTYPE} MATCHES "aarch32")
-  SET(TD_LINUX TRUE)
-  SET(TD_LINUX_32 FALSE)
-  SET(TD_ARM_32 TRUE)
-  MESSAGE(STATUS "input cpuType: aarch32")
-ELSEIF (${CPUTYPE} MATCHES "aarch64")
-  SET(TD_LINUX TRUE)
-  SET(TD_LINUX_64 FALSE)
-  SET(TD_ARM_64 TRUE)
-  MESSAGE(STATUS "input cpuType: aarch64")
-ELSEIF (${CPUTYPE} MATCHES "mips64")
-  SET(TD_LINUX TRUE)
-  SET(TD_LINUX_64 FALSE)
-  SET(TD_MIPS_64 TRUE)
-  MESSAGE(STATUS "input cpuType: mips64")
-ELSEIF (${CPUTYPE} MATCHES "x64")
-  MESSAGE(STATUS "input cpuType: x64")
-ELSEIF (${CPUTYPE} MATCHES "x86")
-  MESSAGE(STATUS "input cpuType: x86")
-ELSE ()
-  MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE})
-
+IF ("${CPUTYPE}" STREQUAL "")
   MESSAGE(STATUS "The current platform is detected as " ${CMAKE_SYSTEM_PROCESSOR})
-  IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
+
+  IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64)|(AMD64)")
+    MESSAGE(STATUS "The current platform is amd64")
+    MESSAGE(STATUS "Set CPUTYPE to x64")
+    SET(CPUTYPE "x64")
+  ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)")
     MESSAGE(STATUS "The current platform is x86")
+    MESSAGE(STATUS "Set CPUTYPE to x86")
+    SET(CPUTYPE "x32")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l")
     MESSAGE(STATUS "Set CPUTYPE to aarch32")
     SET(CPUTYPE "aarch32")
   ENDIF ()
 
+ELSE ()
+  # if generate ARM version:
+  #   cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64
+  IF (${CPUTYPE} MATCHES "aarch32")
+    SET(TD_LINUX TRUE)
+    SET(TD_LINUX_32 FALSE)
+    SET(TD_ARM_32 TRUE)
+    MESSAGE(STATUS "input cpuType: aarch32")
+  ELSEIF (${CPUTYPE} MATCHES "aarch64")
+    SET(TD_LINUX TRUE)
+    SET(TD_LINUX_64 FALSE)
+    SET(TD_ARM_64 TRUE)
+    MESSAGE(STATUS "input cpuType: aarch64")
+  ELSEIF (${CPUTYPE} MATCHES "mips64")
+    SET(TD_LINUX TRUE)
+    SET(TD_LINUX_64 FALSE)
+    SET(TD_MIPS_64 TRUE)
+    MESSAGE(STATUS "input cpuType: mips64")
+  ELSEIF (${CPUTYPE} MATCHES "x64")
+    MESSAGE(STATUS "input cpuType: x64")
+  ELSEIF (${CPUTYPE} MATCHES "x86")
+    MESSAGE(STATUS "input cpuType: x86")
+  ELSE ()
+    MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE})
+  ENDIF ()
+  
 ENDIF ()
 
 #   cmake -DOSTYPE=Ningsi
-- 
GitLab