diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-14 11:02:00 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-14 11:02:00 +0000 |
| commit | 3fbc62445e7637ff81fa42c6b20f43b9d9607709 (patch) | |
| tree | eb505ccc9dd0d664db8af0fd86df205213ef2603 /lib/mkmf.rb | |
| parent | 0c6103cf50fd3d7c43ff264c9cc9d62c1f723067 (diff) | |
* common.mk,Makefile.in,win32/Makefile.sub (ECHO1): move platform
specific hack from common.mk to Makefile.in (and win32/Makefile.sub).
[Bug #5711]
* lib/mkmf.rb: we can generate Makefile as we like.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ff30feb570..93a2ce76ba 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1705,8 +1705,7 @@ SHELL = /bin/sh V = 0 Q1 = $(V:1=) Q = $(Q1:0=@) -n=$(NULLCMD) -ECHO1 = $(V:1=@$n) +ECHO1 = $(V:1=@#{CONFIG['NULLCMD']}) ECHO = $(ECHO1:0=@echo) #### Start of system configuration section. #### @@ -1742,7 +1741,6 @@ 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']} |