CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Feb  1 10:14:09 UTC 2017

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
Simplify and optimise previous.


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.238 pkgsrc/bootstrap/bootstrap:1.239
--- pkgsrc/bootstrap/bootstrap:1.238    Wed Feb  1 09:54:21 2017
+++ pkgsrc/bootstrap/bootstrap  Wed Feb  1 10:14:09 2017
@@ -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 @@ Linux)
        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)