From ef8139db13537ab2e4ef7d141076cfedb3cf8282 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 5 Nov 2014 05:11:33 +0000 Subject: common.mk: update unicode data only if BASERUBY is available * common.mk (lib/unicode_normalize/tables.rb): do nothing unless BASERUBY is available. MINIRUBY cannot load extension libraries, so cannot update Unicode data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/setup.mak | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'win32') diff --git a/win32/setup.mak b/win32/setup.mak index f64d24d331..f00418e864 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -66,7 +66,14 @@ USE_RUBYGEMS = $(USE_RUBYGEMS) @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE) @echo !if "$$(BASERUBY)" == "">> $(MAKEFILE) @echo BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1 >> $(MAKEFILE) + @echo HAVE_BASERUBY = no>> $(MAKEFILE) + @echo !else>> $(MAKEFILE) + @echo HAVE_BASERUBY = yes>> $(MAKEFILE) @echo !endif>> $(MAKEFILE) +!elseif [$(BASERUBY) -eexit 2> nul] == 0 + @echo HAVE_BASERUBY = yes>> $(MAKEFILE) +!else + @echo HAVE_BASERUBY = no>> $(MAKEFILE) !endif -system-vars-: -osname- -runtime- -headers- -- cgit v1.2.3