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

* configure.in, win32/Makefile.sub (RUNRUBY): require path should

Browse source 
include "." because rbconfig.rb is there.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2011-01-14 02:37:34 +00:00
parent f52c2cc24d
commit 377b85f2cb
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jan 14 11:36:25 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* configure.in, win32/Makefile.sub (RUNRUBY): require path should
include "." because rbconfig.rb is there.
Fri Jan 14 10:40:11 2011 Ryan Davis <ryan@lust.local>
* gem_prelude.rb: Just require rubygems. Fixes rubygems 1.4.

2
configure.in
View file

@ -2195,7 +2195,7 @@ if test x"$cross_compiling" = xyes; then
XRUBY='$(MINIRUBY)'
TEST_RUNNABLE=no
else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'

4
win32/Makefile.sub
View file

@ -263,8 +263,8 @@ RUBYDEF = $(RUBY_SO_NAME).def
MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake
RUNRUBY = $(MINIRUBY)
!else
MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib
RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)"
MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I.
RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I.
!endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) --