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 | |
| parent | 0c6103cf50fd3d7c43ff264c9cc9d62c1f723067 (diff) | |
| download | ruby-3fbc62445e7637ff81fa42c6b20f43b9d9607709.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
5 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Wed Dec 14 19:57:23 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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. + Wed Dec 14 19:22:33 2011 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c, include/ruby/win32.h (rb_w32_fd_is_text): new function. diff --git a/Makefile.in b/Makefile.in index 3441c14169..a3040b600a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,7 @@ SHELL = /bin/sh NULLCMD = @NULLCMD@ +n=$(NULLCMD) +ECHO1 = $(V:1=@$n) RUNCMD = $(SHELL) CHDIR = @CHDIR@ exec = exec @@ -8,8 +8,6 @@ dll: $(LIBRUBY_SO) V = 0 Q1 = $(V:1=) Q = $(Q1:0=@) -n=$(NULLCMD) -ECHO1 = $(V:1=@$n) ECHO = $(ECHO1:0=@echo) RUBYLIB = - 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']} diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a6e764df95..774011c8d9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1,7 +1,7 @@ # -*- makefile -*- SHELL = $(COMSPEC) -NULLCMD = : +ECHO1 = $(V:1=@:) RUNCMD = $(COMSPEC) /c MKFILES = Makefile NULL = nul @@ -733,6 +733,7 @@ s,@target_alias@,$(ARCH)-$(PLATFORM),;t t s,@target_cpu@,$(ARCH),;t t s,@target_vendor@,pc,;t t s,@target_os@,$(PLATFORM),;t t +s,@NULLCMD@,:,;t t s,@CC@,$(CC),;t t s,@CPP@,$(CPP),;t t s,@CXX@,$$(CC),;t t |