diff options
| author | joerg <joerg@pkgsrc.org> | 2015-12-11 23:55:44 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-12-11 23:55:44 +0000 |
| commit | 138094a998436e16cdec8f59a9f2ef2f74eb1093 (patch) | |
| tree | d22e290d6a6a500be8901b3ddc8e3525dc6ba9ee /bootstrap | |
| parent | 87e1bc842c7ee8821557894771533584eed55893 (diff) | |
| download | pkgsrc-138094a998436e16cdec8f59a9f2ef2f74eb1093.tar.gz | |
Match MACHINE_ARCH override used in bsd.prefs.mk on FreeBSD and
DragonFly.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index fe808bfbd46..2287586e364 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.221 2015/11/09 10:54:44 jperkin Exp $ +# $NetBSD: bootstrap,v 1.222 2015/12/11 23:55:44 joerg Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -587,6 +587,10 @@ DragonFly) set_opsys=no check_prog tarprog tar machine_arch=`uname -p` + if [ "$machine_arch" = "amd64" ]; then + machine_arch=x86_64 + bmakexargs="MACHINE_ARCH=$machine_arch" + fi ;; FreeBSD) root_group=wheel @@ -595,6 +599,10 @@ FreeBSD) need_sed=no set_opsys=no machine_arch=`uname -p` + if [ "$machine_arch" = "amd64" ]; then + machine_arch=x86_64 + bmakexargs="MACHINE_ARCH=$machine_arch" + fi check_compiler=yes ;; FreeMiNT) |