ruby-changes:20729
From: yugui <ko1@a...>
Date: Sun, 31 Jul 2011 21:23:40 +0900 (JST)
Subject: [ruby-changes:20729] yugui:r32778 (ruby_1_9_3): * lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in
yugui 2011-07-31 21:21:56 +0900 (Sun, 31 Jul 2011) New Revision: 32778 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32778 Log: * lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in common.mk. ":" in a make variable replacement cause a syntax error with /usr/ccs/bin/make on Solaris. Uses $(NULLCMD) instead. Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/lib/mkmf.rb Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 32777) +++ ruby_1_9_3/ChangeLog (revision 32778) @@ -1,3 +1,10 @@ +Sun Jul 31 21:19:51 2011 Yuki Sonoda (Yugui) <yugui@y...> + + * lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in + common.mk. + ":" in a make variable replacement cause a syntax error with + /usr/ccs/bin/make on Solaris. Uses $(NULLCMD) instead. + Sun Jul 31 21:16:02 2011 Yuki Sonoda (Yugui) <yugui@y...> * complex.c (f_signbit): gcc4 on Solaris DOES have signbit but does Index: ruby_1_9_3/lib/mkmf.rb =================================================================== --- ruby_1_9_3/lib/mkmf.rb (revision 32777) +++ ruby_1_9_3/lib/mkmf.rb (revision 32778) @@ -1640,7 +1640,8 @@ V = 0 Q1 = $(V:1=) Q = $(Q1:0=@) -ECHO1 = $(V:1=@:) +n=$(NULLCMD) +ECHO1 = $(V:1=@$n) ECHO = $(ECHO1:0=@echo) #### Start of system configuration section. #### @@ -1676,6 +1677,8 @@ possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk) extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " " mk << %{ +NULLCMD = #{CONFIG['NULLCMD']} + CC = #{CONFIG['CC']} CXX = #{CONFIG['CXX']} LIBRUBY = #{CONFIG['LIBRUBY']} -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/