Merge pull request #3269 from citrus-it/aarch64

omniosorg · Jul 1, 2023 · 8fdef91 · 8fdef91
2 parents 537b428 + ca2d4d8
commit 8fdef91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/arch.sh b/lib/arch.sh
@@ -19,11 +19,11 @@
 # for different ARCHs. If we see `-a` in the options string, we look for such
 # a helper and invoke that instead.
 
-if getopts ":a:" opt; then
+while getopts ":a:" opt; do
     if [ "$opt" = a -a -x build-arch-$OPTARG.sh ]; then
         ./build-arch-$OPTARG.sh "$@"
         exit 0
     fi
-fi
+done
 OPTIND=1
 
diff --git a/tools/test b/tools/test
@@ -39,7 +39,10 @@ add_target()
 	typeset build=$2
 	typeset dir="`dirname $build`"
 
-	if [[ $build = *.sh ]]; then
+	if [[ $build = */build-arch*.sh ]]; then
+		# Ignore arch-specific scripts
+		:
+	elif [[ $build = *.sh ]]; then
 		set -- `grep '^inherit_ver' $build`
 		if [ $# -gt 1 ]; then
 			shift