X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=build-hc-pkg.git;a=blobdiff_plain;f=build-hc-pkg;fp=build-hc-pkg;h=14ef15e5ade04e1f67f5fea489476bcd65e9722d;hp=27bf1fdd72d420a763af6375c0704badc56c53b0;hb=9ce7d7cfab6f5795e9f90a1b07bbba8f8d6c0a5d;hpb=24ecd4063af8f36ea8c9cb45d1cae4406240be80 diff --git a/build-hc-pkg b/build-hc-pkg index 27bf1fd..14ef15e 100755 --- 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,7 +15,7 @@ function detect_number_of_cpus () { local -r platform=$(detect_platform_type) case "$platform" in - *-*-darwin) + *-*-darwin*) ioreg -r -c IOCPU | fgrep -c \"IOCPUNumber\" ;; *-*-netbsd*)