diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 12:01:29 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 12:01:29 +0000 |
| commit | 7508774fd78015663f1ebda5e47aad450fd813bf (patch) | |
| tree | 00b52b564ca7f3c365d08830d52e2b80610941fb | |
| parent | 18eff087dab3b67ca740d0c08705ada93e7edcb0 (diff) | |
merges r24116 from trunk into ruby_1_9_1.
--
* win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 6 insertions, 2 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. + Tue Jul 14 17:29:20 2009 NARUSE, Yui <naruse@ruby-lang.org> * string.c (rb_str_index_m): return nil if pos is out of string. @@ -4,7 +4,7 @@ #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -#define RUBY_PATCHLEVEL 237 +#define RUBY_PATCHLEVEL 238 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_DAY 12 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d1190e0bc1..064511adf9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -622,7 +622,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 |