From 2a9b565d66467addbd8ac637e1c8fff872428f87 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: * win32/Makefile.sub (CPP): check predefined value.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@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 a659192cd..5e67e414d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 26 15:31:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (CPP): check predefined value.
+
 Mon Sep 25 22:26:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_path_end): skip root directory.  fixed: [ruby-core:08913]
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 48f46f25d..2cd93be76 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -34,7 +34,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)
-- 
cgit