Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only the -m command line option, not MACHINE from the environment,

Browse Source 
is supposed override MACHINE_ARCH from the environment with the
default MACHINE_ARCH for the requested machine.

Add and use an opt_m variable to enforce this.
This commit is contained in:
apb 2014-08-15 18:34:19 +00:00
parent 70b43d6df9
commit 9c3c6064f6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.sh
View File

@ -1,5 +1,5 @@
#! /usr/bin/env sh #! /usr/bin/env sh
# $NetBSD: build.sh,v 1.294 2014/08/10 05:56:36 matt Exp $ # $NetBSD: build.sh,v 1.295 2014/08/15 18:34:19 apb Exp $
# #
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved. # All rights reserved.
@ -1100,6 +1100,7 @@ parseoptions()
{ {
opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:X:xY:yZ:' opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:X:xY:yZ:'
opt_a=false opt_a=false
opt_m=false
if type getopts >/dev/null 2>&1; then if type getopts >/dev/null 2>&1; then
# Use POSIX getopts. # Use POSIX getopts.
@ -1177,6 +1178,7 @@ parseoptions()
-m) -m)
eval ${optargcmd} eval ${optargcmd}
MACHINE="${OPTARG}" MACHINE="${OPTARG}"
opt_m=true
;; ;;
-N) -N)
@ -1372,16 +1374,17 @@ parseoptions()
# Set up MACHINE*. On a NetBSD host, these are allowed to be unset. # Set up MACHINE*. On a NetBSD host, these are allowed to be unset.
# #
# MACHINE_ARCH from the environment may be overridden by getarch
# (based on the MACHINE), but MACHINE_ARCH from the -a option should
# not be overridden.
#
if [ -z "${MACHINE}" ]; then if [ -z "${MACHINE}" ]; then
[ "${uname_s}" = "NetBSD" ] || [ "${uname_s}" = "NetBSD" ] ||
bomb "MACHINE must be set, or -m must be used, for cross builds." bomb "MACHINE must be set, or -m must be used, for cross builds."
MACHINE=${uname_m} MACHINE=${uname_m}
fi fi
$opt_a || getarch if $opt_m && ! $opt_a; then
# Settings implied by the command line -m option
# override MACHINE_ARCH from the environment (if any).
getarch
fi
[ -n "${MACHINE_ARCH}" ] || getarch
validatearch validatearch
# Set up default make(1) environment. # Set up default make(1) environment.
@ -1864,7 +1867,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout} eval cat <<EOF ${makewrapout}
#! ${HOST_SH} #! ${HOST_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.294 2014/08/10 05:56:36 matt Exp $ # Generated from: \$NetBSD: build.sh,v 1.295 2014/08/15 18:34:19 apb Exp $
# with these arguments: ${_args} # with these arguments: ${_args}
# #