Use autotools' idea of the canonical name of platform as-is.

[build-hc-pkg.git] / build-hc-pkg

diff --git a/build-hc-pkg b/build-hc-pkg
index 87e34ef9ef0b63e70f6ca1993ff8d25a14b0810a..14ef15e5ade04e1f67f5fea489476bcd65e9722d 100755 (executable)
--- a/build-hc-pkg
+++ b/build-hc-pkg
@@ -4,8 +4,8 @@ set -e
 function detect_platform_type () {
     local -r canon_name="canon-name/src/canon-name"
 
-    if [[ ! -x "$canon_name" ]]; then
-        gmake -f mk/canon-name.mk
+    if ! gmake --question --file="mk/canon-name.mk" >/dev/null 2>&1; then
+        gmake --file="mk/canon-name.mk" >&2
     fi
 
     "$canon_name"
@@ -15,8 +15,11 @@ function detect_number_of_cpus () {
     local -r platform=$(detect_platform_type)
 
     case "$platform" in
-        *-*-darwin)
-            ioreg -r -c IOCPU | fgrep -c IOCPUNumber
+        *-*-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