aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/setup.mak3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5409f279de..8c890636b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 17 13:26:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/setup.mak (BASERUBY): quit with an error when BASERUBY was not
+ able to set, just like configure.in does. [ruby-dev:42782]
+
Fri Dec 17 07:04:09 2010 Tanaka Akira <akr@fsij.org>
* iseq.c: parenthesize macro arguments.
diff --git a/win32/setup.mak b/win32/setup.mak
index 4ba0ceec3d..69444d019b 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -61,6 +61,9 @@ NTVER = $(NTVER)
<<
!if !defined(BASERUBY)
@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 !endif>> $(MAKEFILE)
!endif
-system-vars-: -runtime- -unicows-