Permalink
Browse files

see ChangeLog

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
eban committed May 21, 2000
1 parent 2f3c20c commit cbe7e21b8ec8ef02f9883f786f332387a09d1ade
Showing with 34 additions and 5 deletions.
  1. +12 −0 ChangeLog
  2. +12 −2 Makefile.in
  3. +2 −2 configure.in
  4. +3 −0 ext/extmk.rb.in
  5. +5 −1 instruby.rb
View
@@ -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>
* re.c (rb_reg_new_1): use /m instead of /p.
View
@@ -125,8 +125,18 @@ test: miniruby$(EXEEXT)
rbconfig.rb: miniruby$(EXEEXT)
@@MINIRUBY@ $(srcdir)/mkconfig.rb rbconfig.rb
-prep.rb: miniruby$(EXEEXT)
- @echo 'PLATFORM=RUBY_PLATFORM="@arch@"' > $@
+fake.rb: miniruby$(EXEEXT)
+ @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
$(SHELL) ./config.status --recheck
View
@@ -688,8 +688,8 @@ if test "$fat_binary" = yes ; then
fi
if test x"$cross_compiling" = xyes; then
- MINIRUBY='ruby -I.. -rprep'
- PREP=prep.rb
+ MINIRUBY="ruby -I`pwd` -rfake"
+ PREP=fake.rb
else
MINIRUBY='./miniruby$(EXEEXT)'
PREP=''
View
@@ -402,6 +402,9 @@ archdir = $(pkglibdir)/@arch@
ruby_interpreter = $topdir + "/miniruby@EXEEXT@"
ruby_interpreter.gsub!("/", "\\")
end
+ if defined? CROSS_COMPILING
+ ruby_interpreter = "@MINIRUBY@"
+ end
mfile.printf <<EOS
TARGET = #{target}
View
@@ -66,7 +66,11 @@
end
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"]
Find.find("lib") do |f|

0 comments on commit cbe7e21

Please sign in to comment.