From 3fbc62445e7637ff81fa42c6b20f43b9d9607709 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 14 Dec 2011 11:02:00 +0000 Subject: * 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 --- lib/mkmf.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/mkmf.rb') 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']} -- cgit v1.2.3