diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-15 05:22:44 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-15 05:22:44 +0000 |
commit | 3dac8eda4127a3c9442848dd4e547f4c8d5cb577 (patch) | |
tree | befc30981083183fc7dab18a64d3d7823b1e488a | |
parent | 2212c1dc165fa4251ff5085eec768daf3a0f69e5 (diff) |
tool/mjit_archflag.sh: separated, too many escapes
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | Makefile.in | 40 | ||||
-rw-r--r-- | tool/mjit_archflag.sh | 39 |
2 files changed, 43 insertions, 36 deletions
diff --git a/Makefile.in b/Makefile.in index 715dc688f7..75e08cf0b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -583,31 +583,8 @@ un-runnable: mjit_config.h: $(ECHO) making $@ @{ \ - quote() { \ - printf "#define $$1"; shift; \ - $${1+printf} $${1+' "%s"'$$sep} $${1+"$$@"}; \ - echo; \ - }; \ - parse_arch_flag() { \ - while [ "$$#" -gt 0 ]; do \ - case "$$1" in \ - -arch) \ - shift; \ - archs="$${archs:+$$archs }$$1"; \ - shift; \ - ;; \ - *) \ - arch_flag="$${arch_flag:+$${arch_flag} }$$1"; \ - shift; \ - ;; \ - esac; \ - done; \ - }; \ + . $(srcdir)/tool/mjit_archflag.sh "$(UNIVERSAL_ARCHNAMES)" $(ARCH_FLAG); \ test "$(Q)" = @ || set -x; \ - archs="$(UNIVERSAL_ARCHNAMES)"; \ - arch_flag=""; \ - parse_arch_flag $(ARCH_FLAG); \ - need_mjit_archflag="$${archs}$${arch_flag}"; \ echo '#ifndef RUBY_MJIT_CONFIG_H'; \ echo '#define RUBY_MJIT_CONFIG_H 1'; \ echo; \ @@ -615,23 +592,14 @@ mjit_config.h: quote MJIT_MIN_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_MIN_HEADER_NAME)"; \ sep=,; \ quote "MJIT_CC_COMMON " $(MJIT_CC); \ - quote "MJIT_CFLAGS $${need_mjit_archflag:+ MJIT_ARCHFLAG}" $(MJIT_CFLAGS); \ + quote "MJIT_CFLAGS MJIT_ARCHFLAG" $(MJIT_CFLAGS); \ quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \ - quote "MJIT_DLDFLAGS $${need_mjit_archflag:+ MJIT_ARCHFLAG}" $(MJIT_DLDFLAGS); \ + quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ quote 'PRELOADENV "@PRELOADENV@"'; \ - $${archs:+echo} $${archs:+'#if 0'}; \ - for arch in $$archs; do \ - echo "#elif defined __$${arch%=*}__"; \ - quote " MJIT_ARCHFLAG " -arch $${arch%=*}; \ - done; \ - $${archs:+echo} $${archs:+'#else'}; \ - if [ "$${arch_flag}" != "" ]; then \ - quote " MJIT_ARCHFLAG " $${arch_flag}; \ - fi; \ - $${archs:+echo} $${archs:+'#endif'}; \ + indent=$${archs+ } define_arch_flags; \ echo; \ echo '#endif /* RUBY_MJIT_CONFIG_H */'; \ } > $@ diff --git a/tool/mjit_archflag.sh b/tool/mjit_archflag.sh new file mode 100644 index 0000000000..4bb3321aff --- /dev/null +++ b/tool/mjit_archflag.sh @@ -0,0 +1,39 @@ +# -*- sh -*- + +quote() { + printf "#${indent}define $1" + shift + ${1+printf} ${1+' "%s"'$sep} ${1+"$@"} + echo +} + +archs="" +arch_flag="" + +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 + +define_arch_flags() { + local indent=${archs:+ } + ${archs:+echo} ${archs:+'#if 0'} + for arch in $archs; do + echo "#elif defined __${arch}__" + quote "MJIT_ARCHFLAG " -arch "${arch}" + done + ${archs:+echo} ${archs:+'#else'} + quote "MJIT_ARCHFLAG ${arch_flag:- /* no flag */}" ${arch_flag} + ${archs:+echo} ${archs:+'#endif'} +} |