From 8af68b08a0049d8662207562893a8edbf8ecff52 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 Sep 2006 06:32:09 +0000
Subject: [PATCH] * win32/Makefile.sub (CPP): check predefined value.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 4 ++++
 win32/Makefile.sub | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4e0f1663eb..197b9b5d05 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 706c078b54..c4e2f2c66d 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)