summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-19 13:43:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-19 13:43:44 +0000
commit3f84ef97409b976bbc07a6b46eff09fd38e86ea0 (patch)
treeef919905aa02700b358500eda44e6d26f0455451
parente205cd80d2e4a4b77a06b74758dfd566d7c0b719 (diff)
fix for Solaris sh
* Makefile.in (mjit_config.h): removed unnecessary assignment. * tool/mjit_archflag.sh (define_arch_flags): need to quote on Solaris. [ruby-dev:50669] [Bug #15319] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in2
-rw-r--r--tool/mjit_archflag.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index f1d5258..0929b59 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -601,7 +601,7 @@ mjit_config.h:
quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \
quote 'PRELOADENV "@PRELOADENV@"'; \
- indent=$${archs+ } define_arch_flags; \
+ define_arch_flags; \
echo; \
echo '#endif /* RUBY_MJIT_CONFIG_H */'; \
} > $@
diff --git a/tool/mjit_archflag.sh b/tool/mjit_archflag.sh
index fc0285e..9bd350b 100644
--- a/tool/mjit_archflag.sh
+++ b/tool/mjit_archflag.sh
@@ -29,7 +29,7 @@ parse_arch_flags() {
}
define_arch_flags() {
- local indent=${archs:+ }
+ local indent=${archs:+' '}
${archs:+echo} ${archs:+'#if 0'}
for arch in $archs; do
echo "#elif defined __${arch}__"