summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-06 17:03:35 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-06 17:03:35 +0000
commit97975b51118d554f7049c175dfc8e67e1700fbfb (patch)
treedf3d0b8577940c651cb007d40645f396638a13e7 /lib
parent623896e8916afc72b86a44a83227afa6cebe973f (diff)
downloadruby-97975b51118d554f7049c175dfc8e67e1700fbfb.tar.gz
ruby-97975b51118d554f7049c175dfc8e67e1700fbfb.tar.xz
ruby-97975b51118d554f7049c175dfc8e67e1700fbfb.zip
* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
rbconfig.rb. (backported from CVS HEAD) * ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the definition of struct sockaddr_storage, but socket.c doesn't include it because this version of ruby still has binary level compatibility with winsock1. * lib/mkmf.rb (create_makefile): should support header files in depend file. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 936774280..f15d0ead3 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -996,7 +996,7 @@ static: $(STATIC_LIB)
while line = dfile.gets()
line.gsub!(/\.o\b/, ".#{$OBJEXT}")
if $nmake
- line.gsub!(%r"(\s)([^\s\/]+\.(?:#{SRC_EXT.join('|')}))(?=\s|\z)", '\1{.;$(VPATH)}\2')
+ line.gsub!(%r"(\s)([^\s\/]+\.(?:#{(SRC_EXT + ['h']).join('|')}))(?=\s|\z)", '\1{.;$(VPATH)}\2')
end
line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h
mfile.print line