summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-26 06:34:15 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-26 06:34:15 +0000
commit2feffe934a7343a1d4cc2ce2b7ce517f032e1f1d (patch)
tree2b5f312f363ee5c60042a13ef93ee776bf4a0f70
parentf42e7324b9278f0a1940e2c8617d0d43c80ddcfc (diff)
downloadruby-2feffe934a7343a1d4cc2ce2b7ce517f032e1f1d.tar.gz
ruby-2feffe934a7343a1d4cc2ce2b7ce517f032e1f1d.tar.xz
ruby-2feffe934a7343a1d4cc2ce2b7ce517f032e1f1d.zip
* {win32,wince}/Makefile.sub (CPP): check predefined value.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--wince/Makefile.sub2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 197b9b5d0..0335f8814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
Tue Sep 26 15:29:55 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * win32/Makefile.sub (CPP): check predefined value.
+ * {win32,wince}/Makefile.sub (CPP): check predefined value.
Tue Sep 26 07:55:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 45686e1cc..a2afe7997 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -34,7 +34,7 @@ VPATH = $(srcdir);$(srcdir)/missing;$(srcdir)/wince
!if !defined(CC)
CC = cl
!endif
-!if !defined(CPP)
+!if !defined(CPP) || "$(CPP)" == "cl"
CPP = $(CC) -E
!endif
!if !defined(YACC)