]> gitweb @ CieloNegro.org - build-hc-pkg.git/commitdiff
Better way to detect the number of CPUs.
authorPHO <pho@cielonegro.org>
Thu, 23 Feb 2012 14:11:15 +0000 (23:11 +0900)
committerPHO <pho@cielonegro.org>
Thu, 23 Feb 2012 14:11:15 +0000 (23:11 +0900)
build-hc-pkg

index 14ef15e5ade04e1f67f5fea489476bcd65e9722d..e0e55f512c25a98bf8c50d4f1277339c5d036d27 100755 (executable)
@@ -12,21 +12,11 @@ function detect_platform_type () {
 }
 
 function detect_number_of_cpus () {
-    local -r platform=$(detect_platform_type)
-
-    case "$platform" in
-        *-*-darwin*)
-            ioreg -r -c IOCPU | fgrep -c \"IOCPUNumber\"
-            ;;
-        *-*-netbsd*)
-            cat /proc/cpuinfo | grep -cE 'processor[[:space:]]*:'
-            ;;
-        *)
-            echo "WARNING: I don't know how to detect the number of processors on this platform." >&2
-            echo "WARNING: GHC will be built using only 1 processor. Expect some slowdown." >&2
-            echo 1
-            ;;
-    esac
+    if ! sysctl -n hw.ncpu; then
+        echo "WARNING: I don't know how to detect the number of processors on this platform." >&2
+        echo "WARNING: GHC will be built using only 1 processor. Expect some slowdown." >&2
+        echo 1
+    fi
 }
 
 function detect_gnu_tar () {