kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkconfig.rb: no BASERUBY

Browse source 
* tool/mkconfig.rb: BASERUBY is transient at core build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-21 06:41:38 +00:00
parent c7d3039187
commit 385ef8e5c2
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Jan 21 15:41:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkconfig.rb: BASERUBY is transient at core build.
Mon Jan 21 13:51:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb ($extmk): traverse parent directories for the case

2
common.mk
View file

@ -936,7 +936,7 @@ $(srcdir)/ext/ripper/ripper.c: parse.y
$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
$(ECHO) generating $@
$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=.
Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
$(srcdir)/ext/dl/callback/callback.c: $(srcdir)/ext/dl/callback/mkcallback.rb $(srcdir)/ext/dl/dl.h
$(ECHO) generating $@

4
tool/mkconfig.rb
View file

@ -73,7 +73,7 @@ File.foreach "config.status" do |line|
if name
case name
when /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/; next
when /^(?:X|(?:MINI|RUN)RUBY$)/; next
when /^(?:X|(?:MINI|RUN|BASE)RUBY$)/; next
when /^(?:MAJOR|MINOR|TEENY)$/; next
when /^RUBY_INSTALL_NAME$/; next if $install_name
when /^RUBY_SO_NAME$/; next if $so_name
@ -132,7 +132,7 @@ File.foreach "config.status" do |line|
val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}])
end
end
v = " CONFIG[\"#{name}\"] #{win32 && vars[name] ? '<< "\n" +' : '='} #{val}\n"
v = " CONFIG[\"#{name}\"] #{win32 && vars[name] ? '<< "\n"' : '='} #{val}\n"
vars[name] = true
if fast[name]
v_fast << v