diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 14:17:34 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 14:17:34 +0000 |
| commit | 2dafa21892b5e75ef64031811d0b6138acf85aa1 (patch) | |
| tree | 2c4b5aee60a7fd1fdd8e524a0fdc8d0702a4c39d /lib | |
| parent | f037909aed0e554b8c53fe7cde258f8ff95047b1 (diff) | |
Forward-ports r32778 from branches/ruby_1_9_3 to trunk.
--
* 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 9b0b8c7872..85666ec004 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1640,7 +1640,8 @@ SHELL = /bin/sh 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 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} 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']} |