diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-03-28 10:35:40 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-03-28 10:35:40 +0000 |
| commit | ffb8c6b35cb5b3e765a784f24e560d3ab46975c7 (patch) | |
| tree | 189be0ae687cd4899694e91c472aa623caca83a6 | |
| parent | 3b947661aa91f7c8291f681dd1d26f79ea562d24 (diff) | |
| download | ruby-ffb8c6b35cb5b3e765a784f24e560d3ab46975c7.tar.gz ruby-ffb8c6b35cb5b3e765a784f24e560d3ab46975c7.tar.xz ruby-ffb8c6b35cb5b3e765a784f24e560d3ab46975c7.zip | |
* ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 12 | ||||
| -rw-r--r-- | lib/mkmf.rb | 12 |
3 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Wed Mar 28 19:29:21 2001 Akinori MUSHA <knu@iDaemons.org> + + * ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place. + Wed Mar 28 17:39:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org> * object.c (rb_str2cstr): warn if string contains \0 and length diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 11eb87bf3..8e6b80402 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -498,6 +498,15 @@ EOS mfile.puts " .c.@OBJEXT@: $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + +.cc.@OBJEXT@: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< +.cpp.@OBJEXT@: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< +.cxx.@OBJEXT@: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< +.C.@OBJEXT@: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< " elsif /nmake/i =~ $make mfile.print " @@ -511,9 +520,6 @@ EOS mfile.print " .c.@OBJEXT@: $(CC) $(CFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) - -.cc.@OBJEXT@ .cpp.@OBJEXT@ .cxx.@OBJEXT@ .C.@OBJEXT@: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) " end diff --git a/lib/mkmf.rb b/lib/mkmf.rb index eb3cb74e1..71f204e5f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -492,6 +492,15 @@ EOMF mfile.print " .c.#{$OBJEXT}: $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + +.cc.#{$OBJEXT}: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< +.cpp.#{$OBJEXT}: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< +.cxx.#{$OBJEXT}: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< +.C.#{$OBJEXT}: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< " elsif /nmake/i =~ $make mfile.print " @@ -507,9 +516,6 @@ EOMF .c.#{$OBJEXT}: $(CC) $(CFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) - -.cc.#{$OBJEXT} .cpp.#{$OBJEXT} .cxx.#{$OBJEXT} .C.#{$OBJEXT}: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) " end |