Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Can't check if cross building with "install=" until after $M...



details:   https://anonhg.NetBSD.org/src/rev/86e85070b619
branches:  trunk
changeset: 542223:86e85070b619
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jan 24 01:17:52 2003 +0000

description:
Can't check if cross building with "install=" until after $MACHINE has
been validated.  Noted by Anthony Mallet on current-users@

diffstat:

 build.sh |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r ed19e56edf3e -r 86e85070b619 build.sh
--- a/build.sh  Fri Jan 24 01:16:34 2003 +0000
+++ b/build.sh  Fri Jan 24 01:17:52 2003 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.84 2003/01/23 16:24:08 lukem Exp $
+#      $NetBSD: build.sh,v 1.85 2003/01/24 01:17:52 lukem Exp $
 #
 # Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -468,11 +468,6 @@
                        if [ "${arg}" = "" ]; then
                                bomb "Must supply a directory with \`install=...'"
                        fi
-                       if [ "${arg}" = "/" ] && \
-                           (   [ "${uname_s}" != "NetBSD" ] || \
-                               [ "${uname_m}" != "$MACHINE" ] ); then
-                               bomb "'install=${arg}' must != / for cross builds."
-                       fi
                        ;;
 
                *)
@@ -675,7 +670,7 @@
        eval cat <<EOF $makewrapout
 #! /bin/sh
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.84 2003/01/23 16:24:08 lukem Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.85 2003/01/24 01:17:52 lukem Exp $
 #
 
 EOF
@@ -805,6 +800,11 @@
 
                install=*)
                        arg=${op#*=}
+                       if [ "${arg}" = "/" ] && \
+                           (   [ "${uname_s}" != "NetBSD" ] || \
+                               [ "${uname_m}" != "$MACHINE" ] ); then
+                               bomb "'${op}' must != / for cross builds."
+                       fi
                        installworld "${arg}"
                        ;;
 



Home | Main Index | Thread Index | Old Index