pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/bootstrap Simplify and optimise previous.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd9a44fbf434
branches:  trunk
changeset: 357918:cd9a44fbf434
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Feb 01 10:14:09 2017 +0000

description:
Simplify and optimise previous.

diffstat:

 bootstrap/bootstrap |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (30 lines):

diff -r 0ba35a9306a3 -r cd9a44fbf434 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed Feb 01 10:00:17 2017 +0000
+++ b/bootstrap/bootstrap       Wed Feb 01 10:14:09 2017 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.238 2017/02/01 09:54:21 sevan Exp $
+# $NetBSD: bootstrap,v 1.239 2017/02/01 10:14:09 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -714,13 +714,11 @@
        fi
        need_sed=no
        set_opsys=no
-       case `uname -m` in
-       ppc64le)
-               machine_arch=powerpc64le
-                       ;;
-       *)
-               machine_arch=`uname -m | sed -e 's/i.86/i386/'`
-                       ;;
+       machine_arch=`uname -m`
+       # Override machine_arch where required.
+       case "$machine_arch" in
+       i?86)           machine_arch=i386 ;;
+       ppc64le)        machine_arch=powerpc64le ;;
        esac
        ;;
 Minix)



Home | Main Index | Thread Index | Old Index