Backout previous on request from mrg - it breaks cross compilation for
sparc64. Matt will recommit a fixed version later.
This commit is contained in:
parent
e0e0bf3120
commit
17cfe6c93e
13
build.sh
13
build.sh
@ -1,5 +1,5 @@
|
|||||||
#! /usr/bin/env sh
|
#! /usr/bin/env sh
|
||||||
# $NetBSD: build.sh,v 1.132 2004/10/09 20:38:01 mrg Exp $
|
# $NetBSD: build.sh,v 1.133 2004/10/11 06:18:38 martin Exp $
|
||||||
#
|
#
|
||||||
# Copyright (c) 2001-2004 The NetBSD Foundation, Inc.
|
# Copyright (c) 2001-2004 The NetBSD Foundation, Inc.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
@ -78,7 +78,6 @@ initdefaults()
|
|||||||
|
|
||||||
uname_s=$(uname -s 2>/dev/null)
|
uname_s=$(uname -s 2>/dev/null)
|
||||||
uname_m=$(uname -m 2>/dev/null)
|
uname_m=$(uname -m 2>/dev/null)
|
||||||
uname_p=$(uname -p 2>/dev/null)
|
|
||||||
|
|
||||||
# If $PWD is a valid name of the current directory, POSIX mandates
|
# If $PWD is a valid name of the current directory, POSIX mandates
|
||||||
# that pwd return it by default which causes problems in the
|
# that pwd return it by default which causes problems in the
|
||||||
@ -226,10 +225,6 @@ getarch()
|
|||||||
xen) # no default MACHINE_ARCH
|
xen) # no default MACHINE_ARCH
|
||||||
;;
|
;;
|
||||||
|
|
||||||
sparc64)
|
|
||||||
MACHINE_ARCH=${uname_p}
|
|
||||||
;;
|
|
||||||
|
|
||||||
alpha|i386|sparc|sparc64|vax)
|
alpha|i386|sparc|sparc64|vax)
|
||||||
MACHINE_ARCH=${MACHINE}
|
MACHINE_ARCH=${MACHINE}
|
||||||
;;
|
;;
|
||||||
@ -280,10 +275,6 @@ validatearch()
|
|||||||
arches="sh5eb sh5el"
|
arches="sh5eb sh5el"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
sparc64)
|
|
||||||
arches="sparc sparc64"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
*)
|
||||||
oma="${MACHINE_ARCH}"
|
oma="${MACHINE_ARCH}"
|
||||||
getarch
|
getarch
|
||||||
@ -870,7 +861,7 @@ createmakewrapper()
|
|||||||
eval cat <<EOF ${makewrapout}
|
eval cat <<EOF ${makewrapout}
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Set proper variables to allow easy "make" building of a NetBSD subtree.
|
# Set proper variables to allow easy "make" building of a NetBSD subtree.
|
||||||
# Generated from: \$NetBSD: build.sh,v 1.132 2004/10/09 20:38:01 mrg Exp $
|
# Generated from: \$NetBSD: build.sh,v 1.133 2004/10/11 06:18:38 martin Exp $
|
||||||
# with these arguments: ${_args}
|
# with these arguments: ${_args}
|
||||||
#
|
#
|
||||||
EOF
|
EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user