[src/trunk]: src/distrib/sets When we ask make about MACHINE_CPU and TARGET_E...

[uwe <uwe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cb2a3af57b36
branches:  trunk
changeset: 358638:cb2a3af57b36
user:      uwe <uwe%NetBSD.org@localhost>
date:      Wed Jan 10 18:15:18 2018 +0000

description:
When we ask make about MACHINE_CPU and TARGET_ENDIANNESS make sure we
use the right bsd.*.mk files.

diffstat:

 distrib/sets/sets.subr |  22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diffs (50 lines):

diff -r c390c7dd8ad3 -r cb2a3af57b36 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Wed Jan 10 18:13:29 2018 +0000
+++ b/distrib/sets/sets.subr    Wed Jan 10 18:15:18 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.181 2017/11/22 23:14:01 kre Exp $
+#      $NetBSD: sets.subr,v 1.182 2018/01/10 18:15:18 uwe Exp $
 #
 
 #
@@ -179,7 +179,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.181 2017/11/22 23:14:01 kre Exp $
+#      # $NetBSD: sets.subr,v 1.182 2018/01/10 18:15:18 uwe Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -605,11 +605,10 @@
 #
 arch_to_cpu()
 {
-       MAKEFLAGS= MAKEVERBOSE= MACHINE_ARCH=${1} ${MAKE} -B -f- all <<EOMAKE
-.include <bsd.own.mk>
-all:
-       @echo \${MACHINE_CPU}
-EOMAKE
+       MACHINE_ARCH=${1} MAKEFLAGS= \
+       ${MAKE} -m ${NETBSDSRCDIR}/share/mk \
+               -f ${NETBSDSRCDIR}/share/mk/bsd.own.mk \
+               -V '${MACHINE_CPU}'
 }
 
 # arch_to_endian mach
@@ -619,11 +618,10 @@
 #
 arch_to_endian()
 {
-       MAKEFLAGS= MAKEVERBOSE= MACHINE_ARCH=${1} ${MAKE} -B -f- all <<EOMAKE
-.include <bsd.endian.mk>
-all:
-       @echo \${TARGET_ENDIANNESS}
-EOMAKE
+       MACHINE_ARCH=${1} MAKEFLAGS= \
+       ${MAKE} -m ${NETBSDSRCDIR}/share/mk \
+               -f ${NETBSDSRCDIR}/share/mk/bsd.endian.mk \
+               -V '${TARGET_ENDIANNESS}'
 }
 
 #####