diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 12:21:56 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-31 12:21:56 +0000 |
| commit | d2b78e79c59d2869d3f98aae80b106045d01e415 (patch) | |
| tree | 3d8eda9d6fbd21ee92a96fbdaa1ef18bc8cea437 | |
| parent | 103507355f43bfa127c3797236805e4c6b8df4b2 (diff) | |
* 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/branches/ruby_1_9_3@32778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 11 insertions, 1 deletions
@@ -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 21:16:02 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp> * complex.c (f_signbit): gcc4 on Solaris DOES have signbit but does 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']} |