summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-26 06:32:09 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-26 06:32:09 +0000
commitf42e7324b9278f0a1940e2c8617d0d43c80ddcfc (patch)
tree463d81cf775e1602536ad625be0606f06f3488bf
parent8b0a11c0affde013f4443c63cc3cf2782600e259 (diff)
downloadruby-f42e7324b9278f0a1940e2c8617d0d43c80ddcfc.tar.gz
ruby-f42e7324b9278f0a1940e2c8617d0d43c80ddcfc.tar.xz
ruby-f42e7324b9278f0a1940e2c8617d0d43c80ddcfc.zip
* win32/Makefile.sub (CPP): check predefined value.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/Makefile.sub2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e0f1663e..197b9b5d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 26 15:29:55 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (CPP): check predefined value.
+
Tue Sep 26 07:55:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_shift): should not move memory region if array
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 706c078b5..c4e2f2c66 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -40,7 +40,7 @@ VPATH = $(srcdir);$(srcdir)/missing;$(srcdir)/win32
!if !defined(CC)
CC = cl
!endif
-!if !defined(CPP)
+!if !defined(CPP) || "$(CPP)" == "cl"
CPP = $(CC) -E
!endif
!if !defined(YACC)