From a42784000e102df0909e8a307c0b0b8ba2938304 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Nov 2018 06:22:17 +0000
Subject: [PATCH] . command in some sh cannot take arguments

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 Makefile.in           |  3 ++-
 tool/mjit_archflag.sh | 30 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 75e08cf0b1..cb33d28a05 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -583,7 +583,8 @@ un-runnable:
 mjit_config.h:
 	$(ECHO) making $@
 	@{ \
-	. $(srcdir)/tool/mjit_archflag.sh "$(UNIVERSAL_ARCHNAMES)" $(ARCH_FLAG); \
+	. $(srcdir)/tool/mjit_archflag.sh; \
+	parse_arch_flags "$(UNIVERSAL_ARCHNAMES)" $(ARCH_FLAG); \
 	test "$(Q)" = @ || set -x; \
 	echo '#ifndef RUBY_MJIT_CONFIG_H'; \
 	echo '#define RUBY_MJIT_CONFIG_H 1'; \
diff --git a/tool/mjit_archflag.sh b/tool/mjit_archflag.sh
index 4bb3321aff..fc0285e16d 100644
--- a/tool/mjit_archflag.sh
+++ b/tool/mjit_archflag.sh
@@ -10,21 +10,23 @@ quote() {
 archs=""
 arch_flag=""
 
-for arch in $1; do
-    archs="${archs:+$archs }${arch%=*}"
-done
+parse_arch_flags() {
+    for arch in $1; do
+	archs="${archs:+$archs }${arch%=*}"
+    done
 
-while shift && [ "$#" -gt 0 ]; do
-    case "$1" in
-	-arch)
-	    shift
-	    archs="${archs:+$archs }$1"
-	    ;;
-	*)
-	    arch_flag="${arch_flag:+${arch_flag} }$1"
-	    ;;
-    esac
-done
+    while shift && [ "$#" -gt 0 ]; do
+	case "$1" in
+	    -arch)
+		shift
+		archs="${archs:+$archs }$1"
+		;;
+	    *)
+		arch_flag="${arch_flag:+${arch_flag} }$1"
+		;;
+	esac
+    done
+}
 
 define_arch_flags() {
     local indent=${archs:+  }