aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-11 14:48:34 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-11 14:48:34 +0000
commitdf7aac7c8dd82f0ff775f1e1067cca10b118945a (patch)
treea41b1a55b08da2521249da4985e21d4401f3656c
parent28ca0b0f20f877b1f00d246cb8d6d4d2fcf259b3 (diff)
downloadruby-df7aac7c8dd82f0ff775f1e1067cca10b118945a.tar.gz
* template/fake.rb.in: Don't assign baseruby, Because it's affect to
Makefile of native gem like json on bundled gems. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--template/fake.rb.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5d97bf3ce..469ae2281f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 11 23:48:30 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * template/fake.rb.in: Don't assign baseruby, Because it's affect to
+ Makefile of native gem like json on bundled gems.
+
Sat Apr 11 23:33:22 2015 Tanaka Akira <akr@fsij.org>
* file.c (rb_f_test): Consider nsec for "=", "<" and ">" for "test"
diff --git a/template/fake.rb.in b/template/fake.rb.in
index e846d59f5c..8b82d0e4d7 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -1,10 +1,10 @@
baseruby="@BASERUBY@"
ruby="${RUBY-$baseruby}"
-baseruby=
"eval" "{" \
"`expr \"$ruby\" : echo > /dev/null || echo exec`" \
"$ruby" '-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' \
"}" || "exit" "$?"
+baseruby=baseruby
ruby=ruby
class Object
remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)