[src/trunk]: src/distrib/sets Use the logic in bsd.own.mk to figure out the t...

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

details:   https://anonhg.NetBSD.org/src/rev/068598379a08
branches:  trunk
changeset: 518087:068598379a08
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Nov 24 02:54:50 2001 +0000

description:
Use the logic in bsd.own.mk to figure out the toolchain format,
and to convert MACHINE_ARCH to a CPU.  Make this cross-build
friendly by specifying MACHINE, MACHINE_ARCH, and MAKE in the
makeflist/checkflist environment.

diffstat:

 distrib/sets/Makefile  |  25 +++++++++++++++++++++++--
 distrib/sets/makeflist |  45 +++++++++++++++++++++++----------------------
 2 files changed, 46 insertions(+), 24 deletions(-)

diffs (138 lines):

diff -r 76744c86d745 -r 068598379a08 distrib/sets/Makefile
--- a/distrib/sets/Makefile     Sat Nov 24 02:41:48 2001 +0000
+++ b/distrib/sets/Makefile     Sat Nov 24 02:54:50 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2000/06/20 06:00:27 thorpej Exp $
+#      $NetBSD: Makefile,v 1.3 2001/11/24 02:54:50 thorpej Exp $
 
 # The `all' target must appear before bsd.own.mk is pulled in.
 all:
@@ -31,13 +31,34 @@
        @true
 .endif
 
+print_machine: .PHONY
+       @echo ${MACHINE}
+
+print_machine_arch: .PHONY
+       @echo ${MACHINE_ARCH}
+
+print_machine_cpu: .PHONY
+       @echo ${MACHINE_CPU}
+
+print_object_fmt: .PHONY
+       @echo ${OBJECT_FMT}
+
+print_use_new_toolchain: .PHONY
+       @echo "${USE_NEW_TOOLCHAIN:Dyes}"
+
+# This target has debugging value only, really.
+makeflist: .PHONY check_destdir
+       DESTDIR=${DESTDIR} MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \
+           MAKE=${MAKE} sh ${.CURDIR}/makeflist
+
 #
 # SET BUILDING TARGETS
 #
 
 .PRECIOUS: checkflist
 checkflist: check_destdir
-       DESTDIR=${DESTDIR} sh ${.CURDIR}/checkflist
+       DESTDIR=${DESTDIR} MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \
+           MAKE=${MAKE} sh ${.CURDIR}/checkflist
 
 .PRECIOUS: maketars
 maketars: check_destdir check_releasedir
diff -r 76744c86d745 -r 068598379a08 distrib/sets/makeflist
--- a/distrib/sets/makeflist    Sat Nov 24 02:41:48 2001 +0000
+++ b/distrib/sets/makeflist    Sat Nov 24 02:54:50 2001 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.38 2001/11/19 20:43:33 tv Exp $
+# $NetBSD: makeflist,v 1.39 2001/11/24 02:54:50 thorpej Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -8,9 +8,11 @@
 
 # set defaults
 : ${MAKE=make}
-machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | $MAKE -s -f-`}
-arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | $MAKE -s -f-`}
-tc=${USE_NEW_TOOLCHAIN:-`printf '.include <bsd.own.mk>\nxxx:\n\techo ${USE_NEW_TOOLCHAIN:Dyes}' | ${MAKE} -s -f-`}
+machine=`${MAKE} print_machine`
+machine_arch=`${MAKE} print_machine_arch`
+machine_cpu=`${MAKE} print_machine_cpu`
+object_fmt=`${MAKE} print_object_fmt`
+tc=`${MAKE} print_use_new_toolchain`
 setd=`pwd`
 nlists="base comp etc games man misc text"
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
@@ -26,7 +28,9 @@
                lists=$xlists
                ;;
        -a*)
-               arch=$2; shift
+               machine_arch=`MACHINE_ARCH=${2} ${MAKE} print_machine_arch`
+               machine_cpu=`MACHINE_ARCH=${2} ${MAKE} print_machine_cpu`
+               shift
                ;;
        -m*)
                machine=$2; shift
@@ -39,10 +43,10 @@
 Usage: $0 [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
        -b              make netbsd + x11 lists
        -x              only make x11 lists
-       -a arch         set arch (e.g, m68k, mips, powerpc)     [$arch]
-       -m machine      set machine (e.g, amiga, i386, macppc)  [$machine]
-       -s setsdir      directory to find sets  [$setd]
-       [setname ...]   sets to build   [$lists]
+       -a arch         set arch (e.g, m68k, mipseb, mipsel, powerpc) [$arch]
+       -m machine      set machine (e.g, amiga, i386, macppc) [$machine]
+       -s setsdir      directory to find sets [$setd]
+       [setname ...]   sets to build [$lists]
 USAGE
                exit 1
                ;;
@@ -56,30 +60,27 @@
        lists="$@"
 fi
 
-# Convert mipse[lb] to mips after processing command line arguments.
-arch=`echo $arch | sed s,^mipse.,mips, | sed s,^sh3e.,sh3,`
-
-# Compute toolchain  used on target cpu.
-if [ "$arch" = "mips" -o "$machine" = "alpha" -o "$arch" = "powerpc" -o "$arch" = "sparc" -o "$arch" = "sparc64" -o "$arch" = "i386" -o "$arch" = "arm26" -o "$machine" = "hp300" -o "$machine" = 
"mvme68k" -o "$machine" = "news68k" -o "$machine" = "sun3" -o "$machine" = "next68k" -o "$machine" = "cesfic" -o "$machine" = "atari" ]; then
+# Determine shlib type.
+if [ "$object_fmt" = "ELF" ]; then
        shlib=elf
+elif [ "$machine_cpu" = "sh3" ]; then
+       shlib=
 else
-       if [ "$arch" = "sh3" ]; then
-               shlib=
-       else
-               shlib=aout
-       fi
+       shlib=aout
 fi
 
 # Turn off lintlibs for some ports.
 lintlibs=
-if [ "$machine" = "sparc64" -o "$arch" = "sh3" -o "$arch" = "m68000" ]; then
+if [ "$machine" = "sparc64" -o "$machine_cpu" = "sh3" -o \
+     "$machine_arch" = "m68000" ]; then
        lintlibs=no
 fi
 
 for setname in $lists; do
        cat $setd/lists/$setname/mi
-       if [ "$machine" != "$cpu" -a -f $setd/lists/$setname/ad.${arch} ]; then
-               cat $setd/lists/$setname/ad.${arch}
+       if [ "$machine" != "$machine_arch" -a \
+            -f $setd/lists/$setname/ad.${machine_cpu} ]; then
+               cat $setd/lists/$setname/ad.${machine_cpu}
        fi
        if [ -f $setd/lists/$setname/md.${machine} ]; then
                cat $setd/lists/$setname/md.${machine}