1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Forward-ports r32778 from branches/ruby_1_9_3 to trunk.

Browse Source 
--
* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-07-31 14:17:34 +00:00
parent f037909aed
commit 2dafa21892
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun Jul 31 21:19:51 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* 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 20:39:12 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp> Sun Jul 31 20:39:12 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* common.mk (ECHO1): nmake does not allow parenthesis in make variable * common.mk (ECHO1): nmake does not allow parenthesis in make variable

5
lib/mkmf.rb
View File

@ -1640,7 +1640,8 @@ SHELL = /bin/sh
V = 0 V = 0
Q1 = $(V:1=) Q1 = $(V:1=)
Q = $(Q1:0=@) Q = $(Q1:0=@)
ECHO1 = $(V:1=@:) n=$(NULLCMD)
ECHO1 = $(V:1=@$n)
ECHO = $(ECHO1:0=@echo) ECHO = $(ECHO1:0=@echo)
#### Start of system configuration section. #### #### Start of system configuration section. ####
@ -1676,6 +1677,8 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk) possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " " extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
mk << %{ mk << %{
NULLCMD = #{CONFIG['NULLCMD']}
CC = #{CONFIG['CC']} CC = #{CONFIG['CC']}
CXX = #{CONFIG['CXX']} CXX = #{CONFIG['CXX']}
LIBRUBY = #{CONFIG['LIBRUBY']} LIBRUBY = #{CONFIG['LIBRUBY']}