summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-01 06:12:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-01 06:12:23 +0000
commit6d757a9d8f2e80ef4dbe57caabd8cda223f9ad99 (patch)
tree33ffc79b4cf3a68b028ce263ff53980fe6edb161
parent46134b8586eb4b05c89b31cfe3bd5a8b7fbea63d (diff)
downloadruby-6d757a9d8f2e80ef4dbe57caabd8cda223f9ad99.tar.gz
ruby-6d757a9d8f2e80ef4dbe57caabd8cda223f9ad99.tar.xz
ruby-6d757a9d8f2e80ef4dbe57caabd8cda223f9ad99.zip
* Makefile.in (.c.i): use CPP instead of CC, since gcc -E can't
work with multiple -arch options. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e97b73f4..b524fd994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 1 15:12:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (.c.i): use CPP instead of CC, since gcc -E can'
+ work with multiple -arch options.
+
Wed Apr 1 13:46:20 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (rb_thread_fd_select): new function to call select
diff --git a/Makefile.in b/Makefile.in
index 766b1124d..1de779a3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,7 +216,7 @@ lex.c: defs/keywords
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
.c.i:
- $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
+ $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
clean-local::
@$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output