diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-08-30 01:25:51 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-08-30 01:25:51 (EDT) |
| commit | d23a01def42d06b7f349fb3359a1f0838656a28a (patch) | |
| tree | 9a3dba4cfd03d1a28357b7075e10960f5a3243b8 /lib | |
| parent | 50ab260b801b266f94ef0ed6c555e128158dc240 (diff) | |
{arch,plat}_is_concerned(): Fix handling of "all"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/archplat.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/archplat.sh b/lib/archplat.sh index 7100568..d7b1424 100644 --- a/lib/archplat.sh +++ b/lib/archplat.sh @@ -94,12 +94,6 @@ arch_is_concerned() if [ "x${arches}" = 'x' ]; then return 0 - elif [ "x${host_arch}" = 'xall' ]; then - if [ "x${arches}" = 'xall' ]; then - return 0 - else - return 1 - fi else seen_arch=1 for arch in ${arches}; do @@ -109,7 +103,7 @@ arch_is_concerned() then seen_arch=1 break - else + elif [ "x${host_arch}" != 'xall' ]; then seen_arch=0 fi elif match_arch "${host_arch}" "${arch}"; then @@ -131,12 +125,6 @@ plat_is_concerned() if [ "x${plats}" = 'x' ]; then return 0 - elif [ "x${host_plat}" = 'xall' ]; then - if [ "x${plats}" = 'xall' ]; then - return 0 - else - return 1 - fi else seen_plat=1 for plat in ${plats}; do @@ -146,7 +134,7 @@ plat_is_concerned() then seen_plat=1 break - else + elif [ "x${host_plat}" != 'xall' ]; then seen_plat=0 fi elif match_plat "${host_plat}" "${plat}"; then |