diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 07:30:42 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 07:30:42 +0000 |
| commit | 33ba2be3de311b24775cc33ff6629999fe983ec5 (patch) | |
| tree | 87a4e7a4f8b31f89052fe6f4252f9d4e39551125 | |
| parent | 67e29c54b68b110cfa783c99842b96219d8a0d67 (diff) | |
| download | ruby-33ba2be3de311b24775cc33ff6629999fe983ec5.tar.gz ruby-33ba2be3de311b24775cc33ff6629999fe983ec5.tar.xz ruby-33ba2be3de311b24775cc33ff6629999fe983ec5.zip | |
* win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Jul 15 16:29:35 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb. + Wed Jul 15 06:21:50 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782] diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c9d458220..03e5d97c9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -666,7 +666,7 @@ s,@BASERUBY@,$(BASERUBY),;t t s,@OUTFLAG@,$(OUTFLAG),;t t s,@COUTFLAG@,$(COUTFLAG),;t t s,@CPPOUTFILE@,-P,;t t -s,@LIBPATHFLAG@, -libpath:"%s",;t t +s,@LIBPATHFLAG@, -libpath:%s,;t t s,@RPATHFLAG@,,;t t s,@LIBARG@,%s.lib,;t t s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) -link $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t |