diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:06:48 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:06:48 +0000 |
| commit | fa0c48186e87e596c5082a6516f74b2158396013 (patch) | |
| tree | ea374c022bf51e2fb514e2fa38bc61cf29d0206f | |
| parent | 1e09355e88d29299153c37c62d92980b9eb6ed66 (diff) | |
merges r22796 and r22865 from trunk into ruby_1_9_1.
--
* configure.in (MINIRUBY): use $(arch)-fake.rb.
--
* configure.in (MINIRUBY): keep macro into Makefile.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Mar 10 04:53:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (MINIRUBY): keep macro into Makefile. + + * configure.in (RUBY_CHECK_SIZEOF): fix for fallback. + Thu Feb 19 15:47:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * template/fake.rb.in: extracted from Makefile.in. diff --git a/configure.in b/configure.in index 0529f42054..c98a024562 100644 --- a/configure.in +++ b/configure.in @@ -1669,7 +1669,7 @@ fi #fi if test x"$cross_compiling" = xyes; then - test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake" + test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake' PREP='$(arch)-fake.rb' RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' else |