diff options
| author | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-11-03 08:32:36 +0000 |
|---|---|---|
| committer | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-11-03 08:32:36 +0000 |
| commit | 149abe0ab4480bc670eb1927a7aacdeb5799cf99 (patch) | |
| tree | be35b731a9b5f69b8e80eef4a0262343abbb7a4d /netbsd-2.0-xen-sparse | |
| parent | 2259b4a607c7eb7cdfe1ce889a2bed327ac7c1aa (diff) | |
| download | xen-149abe0ab4480bc670eb1927a7aacdeb5799cf99.tar.gz xen-149abe0ab4480bc670eb1927a7aacdeb5799cf99.tar.bz2 xen-149abe0ab4480bc670eb1927a7aacdeb5799cf99.zip | |
bitkeeper revision 1.1159.152.3 (418897a4CxX9i8wXDd9o1ZAah8MBmQ)
Fix parallel make problems (some rules had multiple dependencies which
themselves were inter-dependent).
Fix netbsd build when 'uname -i' is unavailable -- default to i386.
Diffstat (limited to 'netbsd-2.0-xen-sparse')
| -rwxr-xr-x | netbsd-2.0-xen-sparse/nbconfig-xen | 2 | ||||
| -rwxr-xr-x | netbsd-2.0-xen-sparse/nbmake-xen | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/netbsd-2.0-xen-sparse/nbconfig-xen b/netbsd-2.0-xen-sparse/nbconfig-xen index 23c33c7ac2..2bd5a77cef 100755 --- a/netbsd-2.0-xen-sparse/nbconfig-xen +++ b/netbsd-2.0-xen-sparse/nbconfig-xen @@ -2,7 +2,7 @@ # : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)} -: ${HARCH:=$(uname -i)} +: ${HARCH:=$(uname -i 2>/dev/null || echo i386)} : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')} : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')} : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')} diff --git a/netbsd-2.0-xen-sparse/nbmake-xen b/netbsd-2.0-xen-sparse/nbmake-xen index 64cb7a5c38..6854538905 100755 --- a/netbsd-2.0-xen-sparse/nbmake-xen +++ b/netbsd-2.0-xen-sparse/nbmake-xen @@ -4,7 +4,7 @@ # : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)} -: ${HARCH:=$(uname -i)} +: ${HARCH:=$(uname -i 2>/dev/null || echo i386)} : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')} : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')} : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')} |