1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2001-03-28 10:35:40 +00:00
parent 62261ccb47
commit 03f06165b8
3 changed files with 22 additions and 6 deletions

View file

@ -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

View file

@ -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

View file

@ -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