summaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-22 22:32:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-22 22:32:39 +0000
commit752bccaf18f090d26ccc444d515fd6c020656e06 (patch)
tree5ab8b6234dc465bb48fb32e7d1a67f12e75309be /win32
parent32f625180d433487a284ca557727606e7f5038e8 (diff)
downloadruby-752bccaf18f090d26ccc444d515fd6c020656e06.tar.gz
ruby-752bccaf18f090d26ccc444d515fd6c020656e06.tar.xz
ruby-752bccaf18f090d26ccc444d515fd6c020656e06.zip
* configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
ruby without current libraries. * common.mk (rdoc): use XRUBY. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub5
1 files changed, 5 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index b3567af16..680b3dea7 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -254,6 +254,11 @@ RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)"
!endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) --
+!if $(CROSS_COMPILING)
+XRUBY = $(MINIRUBY)
+!else
+XRUBY = $(RUNRUBY)
+!endif
!ifndef RUBY
RUBY = ruby
!endif