[前][次][番号順一覧][スレッド一覧]

ruby-changes:53592

From: nobu <ko1@a...>
Date: Mon, 19 Nov 2018 22:43:49 +0900 (JST)
Subject: [ruby-changes:53592] nobu:r65808 (trunk): fix for Solaris sh

nobu	2018-11-19 22:43:44 +0900 (Mon, 19 Nov 2018)

  New Revision: 65808

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65808

  Log:
    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]

  Modified files:
    trunk/Makefile.in
    trunk/tool/mjit_archflag.sh
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65807)
+++ Makefile.in	(revision 65808)
@@ -601,7 +601,7 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L601
 	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 */'; \
 	} > $@
Index: tool/mjit_archflag.sh
===================================================================
--- tool/mjit_archflag.sh	(revision 65807)
+++ tool/mjit_archflag.sh	(revision 65808)
@@ -29,7 +29,7 @@ parse_arch_flags() { https://github.com/ruby/ruby/blob/trunk/tool/mjit_archflag.sh#L29
 }
 
 define_arch_flags() {
-    local indent=${archs:+  }
+    local indent=${archs:+'  '}
     ${archs:+echo} ${archs:+'#if 0'}
     for arch in $archs; do
 	echo "#elif defined __${arch}__"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]