diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-12 14:02:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-12 14:02:46 +0000 |
| commit | 8c152cc0c74970fd63f3e0c2e4488d43b25be0d7 (patch) | |
| tree | 8441d50cab7118102eff0ba244fc34f02a1a2def | |
| parent | 33419cba1cd8c17f380c129b03250af72566159a (diff) | |
merges r22870 from trunk into ruby_1_9_1.
--
* win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO
and so on. based on a patch by Charlie Savage at
[ruby-core:22794]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 10 |
2 files changed, 10 insertions, 6 deletions
@@ -1,4 +1,8 @@ -Tue Mar 10 12:27:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Mar 10 13:45:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO + and so on. based on a patch by Charlie Savage at + [ruby-core:22794] * win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so that extconf.rb could refer it. [ruby-core:22725] diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 264652eb1..818762ff7 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -624,7 +624,7 @@ s,@CPPOUTFILE@,-P,;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) $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;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 !if $(MSC_VER) >= 1400 s,@LINK_SO@,@$$(RUBY) -run -e wait_writable -- -n 10 $$(@),;t t s,@LINK_SO@,$(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t @@ -659,7 +659,7 @@ miniruby: miniruby$(EXEEXT) miniruby$(EXEEXT): @echo. $(LIBS) - $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ $(LDFLAGS) + $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS) miniruby.exe -v $(LDSHARED_1) $(LDSHARED_2) @@ -670,7 +670,7 @@ miniruby.rc: !if "$(PROGRAM)" != "" $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \ - $(OUTFLAG)$@ $(LIBRUBYARG) $(LDFLAGS) $(XLDFLAGS) + $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS) $(LDSHARED_0) $(LDSHARED_1) $(LDSHARED_2) @@ -680,7 +680,7 @@ $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \ $(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \ - $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows + -link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows $(LDSHARED_0) $(LDSHARED_1) $(LDSHARED_2) @@ -696,7 +696,7 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res @echo. $(DLDOBJS) @-$(PRE_LIBRUBY_UPDATE) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \ - $(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \ + $(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \ $(LIBRUBY_DLDFLAGS) $(LDSHARED_0) $(LDSHARED_1) |