From 06b7c32135974a8c4839c7fe4856cb9f1312e0e0 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Sun, 24 Jan 2016 16:14:44 +0000
Subject: Attempt to bring sanity to how ABI and MACHINE_ARCH are set.

Previously there were at least 5 different ways MACHINE_ARCH could be set,
some statically and some at run time, and in many cases these settings
differed, leading to issues at pkg_add time where there was conflict
between the setting encoded into the package and that used by pkg_install.

Instead, move to a single source of truth where the correct value based on
the host and the chosen (or default) ABI is determined in the bootstrap
script.  The value can still be overridden in mk.conf if necessary, e.g.
for cross-compiling.

ABI is now set by default and if unset a default is calculated based on
MACHINE_ARCH.  This fixes some OS, e.g. Linux, where the wrong default was
previously chosen.

As a result of the refactoring there is no need for LOWER_ARCH, with
references to it replaced by MACHINE_ARCH.  SPARC_TARGET_ARCH is also
removed.
---
 news/nn/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'news')

diff --git a/news/nn/Makefile b/news/nn/Makefile
index 0453ab3c3e3..e13c60f433b 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2015/08/18 07:31:16 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2016/01/24 16:14:45 jperkin Exp $
 
 DISTNAME=	nn-6.7.3
 PKGREVISION=	4
@@ -30,7 +30,7 @@ MFILE=		m-i80386.h
 .elif ${MACHINE_ARCH} == "mipseb"
 MFILE=         m-mipsel.h
 .else
-MFILE=		m-${LOWER_ARCH}.h
+MFILE=		m-${MACHINE_ARCH}.h
 .endif
 
 .if ${OPSYS} == "IRIX"
-- 
cgit v1.2.3