diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-03 05:48:05 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-03 05:48:05 +0000 |
| commit | b5dc2576cc60930099cd942ffa1de2c2d759471b (patch) | |
| tree | cad92be5fdb7ebbf51274b2b0bd8b012c67e230f | |
| parent | 2fc40194d2ddc05a481c0eddc8fe9a1c95e23196 (diff) | |
| download | ruby-b5dc2576cc60930099cd942ffa1de2c2d759471b.tar.gz | |
* ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.
* spec/default.mspec: ditto.
* template/Doxyfile.tmpl: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | ext/extmk.rb | 1 | ||||
| -rw-r--r-- | spec/default.mspec | 1 | ||||
| -rw-r--r-- | template/Doxyfile.tmpl | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Tue Aug 3 14:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441. + + * spec/default.mspec: ditto. + + * template/Doxyfile.tmpl: ditto. + Tue Aug 3 14:19:42 2010 NAKAMURA Usaku <usa@ruby-lang.org> * lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence diff --git a/ext/extmk.rb b/ext/extmk.rb index c5c61c4736..916c3a0f02 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -352,7 +352,6 @@ unless CROSS_COMPILING $ruby << " -I'$(top_srcdir)/lib'" $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout ENV["RUBYLIB"] = "-" - ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}" end $mflags << "ruby=#$ruby" diff --git a/spec/default.mspec b/spec/default.mspec index 6505fca904..a23df2f25a 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -16,7 +16,6 @@ class MSpecScript -I#{srcdir}/lib -I#{srcdir}/#{config['EXTOUT']}/common -I#{srcdir}/- - -r#{srcdir}/ext/purelib.rb #{srcdir}/tool/runruby.rb --extout=#{config['EXTOUT']} ] end diff --git a/template/Doxyfile.tmpl b/template/Doxyfile.tmpl index 34a42983ce..2abf112863 100644 --- a/template/Doxyfile.tmpl +++ b/template/Doxyfile.tmpl @@ -9,7 +9,7 @@ end srcdir ||= File.dirname(File.dirname(__FILE__)) load 'rbconfig.rb' unless miniruby - miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb' + miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./-' RbConfig.expand(miniruby, RbConfig::CONFIG.merge("srcdir"=>srcdir)) end dot = RbConfig::CONFIG['DOT'] || "" |