If ad.${machine_arch} exists, perfer it over ad.${machine_cpu},
because it will have more specific information.
This commit is contained in:
parent
9c104401d1
commit
9aa60a9f15
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# $NetBSD: makeflist,v 1.49 2002/07/23 09:02:45 lukem Exp $
|
# $NetBSD: makeflist,v 1.50 2002/08/10 02:01:00 thorpej Exp $
|
||||||
#
|
#
|
||||||
# Print out the files in some or all lists.
|
# Print out the files in some or all lists.
|
||||||
# Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
|
# Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
|
||||||
@ -100,7 +100,12 @@ unset _lists
|
|||||||
for setname in $lists; do
|
for setname in $lists; do
|
||||||
cat $setd/lists/$setname/mi
|
cat $setd/lists/$setname/mi
|
||||||
if [ "$machine" != "$machine_arch" ]; then
|
if [ "$machine" != "$machine_arch" ]; then
|
||||||
if [ -f $setd/lists/$setname/ad.${machine_cpu} ]; then
|
# Prefer an ad.${machine_arch} over an ad.${machine_cpu},
|
||||||
|
# since the arch-specific one will be more specific than
|
||||||
|
# the cpu-specific one.
|
||||||
|
if [ -f $setd/lists/$setname/ad.${machine_arch} ]; then
|
||||||
|
cat $setd/lists/$setname/ad.${machine_arch}
|
||||||
|
elif [ -f $setd/lists/$setname/ad.${machine_cpu} ]; then
|
||||||
cat $setd/lists/$setname/ad.${machine_cpu}
|
cat $setd/lists/$setname/ad.${machine_cpu}
|
||||||
fi
|
fi
|
||||||
if [ "$shlib" != "no" -a \
|
if [ "$shlib" != "no" -a \
|
||||||
|
Loading…
Reference in New Issue
Block a user