summaryrefslogtreecommitdiff
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
commitde937a24638196a16157ec77f3f5e4a2505e44ee (patch)
treee07be5cdaf1ddd671a3bc6fb064ce31b3d602f55
parent569050ece8ad2b173bb7380a4d85c69a923e3957 (diff)
* win32/Makefile.sub (CPP): check predefined value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 a659192cd5..5e67e414d7 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 48f46f25d3..2cd93be76e 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)