summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e635dd5ba..9a01e0b3f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 12 07:09:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (config.status): setup MINIRUBY environment for
+ cross-compiling.
+
Fri Mar 12 06:48:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/extconf.rb: log() is built-in in some compilers and needs
diff --git a/Makefile.in b/Makefile.in
index 1f26e0f470..4402e701c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -181,7 +181,8 @@ uncommon.mk: $(srcdir)/common.mk
sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in
- @PWD= MINIRUBY="$(MINIRUBY)"; set $(SHELL) ./config.status --recheck; \
+ @PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
+ set $(SHELL) ./config.status --recheck; \
exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
$(srcdir)/configure: $(srcdir)/configure.in