improve os.cpuinfo

2 files changed, 8 insertions, 2 deletions

diff --git a/xmake/core/base/cpu.lua b/xmake/core/base/cpu.lua
index 3e034da60..bff49e537 100644
--- a/xmake/core/base/cpu.lua
+++ b/xmake/core/base/cpu.lua
@@ -199,7 +199,7 @@ end
 
 -- get cpu number
 function cpu.number()
-    return os.cpuinfo().ncpu
+    return os._cpuinfo().ncpu
 end
 
 -- get cpu info
@@ -209,7 +209,7 @@ function cpu.info()
     cpuinfo.model  = cpu.model()
     cpuinfo.family = cpu.family()
     cpuinfo.march  = cpu.march()
-    cpuinfo.number = cpu.number()
+    cpuinfo.ncpu   = cpu.number()
     return cpuinfo
 end
 
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 5f116c35a..47068793f 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -39,6 +39,7 @@ os._rmdir       = os._rmdir or os.rmdir
 os._tmpdir      = os._tmpdir or os.tmpdir
 os._setenv      = os._setenv or os.setenv
 os._getenvs     = os._getenvs or os.getenvs
+os._cpuinfo     = os._cpuinfo or os.cpuinfo
 os._readlink    = os._readlink or os.readlink
 
 -- syserror code
@@ -1075,6 +1076,11 @@ function os.pbcopy(data)
     end
 end
 
+-- get cpu info
+function os.cpuinfo()
+    return require("base/cpu").info()
+end
+
 -- read the content of symlink
 function os.readlink(symlink)
     return os._readlink(path.absolute(symlink))