see ChangeLog
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b8986bfdd6
commit
b069230a3a
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
|||||||
|
Sun May 21 17:31:37 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
|
||||||
|
|
||||||
|
* instruby.rb: support "make install" for cross-compiling.
|
||||||
|
|
||||||
|
* ext/extmk.rb.in: ditto.
|
||||||
|
|
||||||
|
Sun May 21 14:22:49 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
|
||||||
|
|
||||||
|
* Makefile.in: rename prep.rb to fake.rb.
|
||||||
|
|
||||||
|
* configure.in: ditto.
|
||||||
|
|
||||||
Wed May 17 14:14:23 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
|
Wed May 17 14:14:23 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
|
||||||
|
|
||||||
* re.c (rb_reg_new_1): use /m instead of /p.
|
* re.c (rb_reg_new_1): use /m instead of /p.
|
||||||
|
14
Makefile.in
14
Makefile.in
@ -125,8 +125,18 @@ test: miniruby$(EXEEXT)
|
|||||||
rbconfig.rb: miniruby$(EXEEXT)
|
rbconfig.rb: miniruby$(EXEEXT)
|
||||||
@@MINIRUBY@ $(srcdir)/mkconfig.rb rbconfig.rb
|
@@MINIRUBY@ $(srcdir)/mkconfig.rb rbconfig.rb
|
||||||
|
|
||||||
prep.rb: miniruby$(EXEEXT)
|
fake.rb: miniruby$(EXEEXT)
|
||||||
@echo 'PLATFORM=RUBY_PLATFORM="@arch@"' > $@
|
@echo ' \
|
||||||
|
class Object; \
|
||||||
|
remove_const :RUBY_PLATFORM; \
|
||||||
|
RUBY_PLATFORM = "@arch@"; \
|
||||||
|
if defined? PLATFORM; \
|
||||||
|
remove_const :PLATFORM; \
|
||||||
|
PLATFORM = "@arch@"; \
|
||||||
|
end; \
|
||||||
|
CROSS_COMPILING = true; \
|
||||||
|
end \
|
||||||
|
' > $@
|
||||||
|
|
||||||
config.status: $(srcdir)/configure
|
config.status: $(srcdir)/configure
|
||||||
$(SHELL) ./config.status --recheck
|
$(SHELL) ./config.status --recheck
|
||||||
|
@ -688,8 +688,8 @@ if test "$fat_binary" = yes ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$cross_compiling" = xyes; then
|
if test x"$cross_compiling" = xyes; then
|
||||||
MINIRUBY='ruby -I.. -rprep'
|
MINIRUBY="ruby -I`pwd` -rfake"
|
||||||
PREP=prep.rb
|
PREP=fake.rb
|
||||||
else
|
else
|
||||||
MINIRUBY='./miniruby$(EXEEXT)'
|
MINIRUBY='./miniruby$(EXEEXT)'
|
||||||
PREP=''
|
PREP=''
|
||||||
|
@ -402,6 +402,9 @@ archdir = $(pkglibdir)/@arch@
|
|||||||
ruby_interpreter = $topdir + "/miniruby@EXEEXT@"
|
ruby_interpreter = $topdir + "/miniruby@EXEEXT@"
|
||||||
ruby_interpreter.gsub!("/", "\\")
|
ruby_interpreter.gsub!("/", "\\")
|
||||||
end
|
end
|
||||||
|
if defined? CROSS_COMPILING
|
||||||
|
ruby_interpreter = "@MINIRUBY@"
|
||||||
|
end
|
||||||
|
|
||||||
mfile.printf <<EOS
|
mfile.printf <<EOS
|
||||||
TARGET = #{target}
|
TARGET = #{target}
|
||||||
|
@ -66,7 +66,11 @@ if RUBY_PLATFORM =~ /-aix/
|
|||||||
end
|
end
|
||||||
|
|
||||||
Dir.chdir "ext"
|
Dir.chdir "ext"
|
||||||
system "../miniruby#{exeext} extmk.rb install #{destdir}"
|
if defined? CROSS_COMPILING
|
||||||
|
system "#{CONFIG['MINIRUBY']} extmk.rb install #{destdir}"
|
||||||
|
else
|
||||||
|
system "../miniruby#{exeext} extmk.rb install #{destdir}"
|
||||||
|
end
|
||||||
Dir.chdir CONFIG["srcdir"]
|
Dir.chdir CONFIG["srcdir"]
|
||||||
|
|
||||||
Find.find("lib") do |f|
|
Find.find("lib") do |f|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user