1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO

Browse Source 
and so on.  based on a patch by Charlie Savage at
  [ruby-core:22794]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-10 04:45:51 +00:00
parent 5157e572b8
commit a3e3fcbcd0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 * win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so
that extconf.rb could refer it. [ruby-core:22725] that extconf.rb could refer it. [ruby-core:22725]

11
win32/Makefile.sub
View File

@ -167,7 +167,6 @@ CXXFLAGS = $(CFLAGS)
!if !defined(LDFLAGS) !if !defined(LDFLAGS)
LDFLAGS = -incremental:no -debug -opt:ref -opt:icf LDFLAGS = -incremental:no -debug -opt:ref -opt:icf
!endif !endif
LDFLAGS = -link $(LDFLAGS)
!if !defined(XLDFLAGS) !if !defined(XLDFLAGS)
XLDFLAGS = -stack:$(STACK) XLDFLAGS = -stack:$(STACK)
!endif !endif
@ -653,7 +652,7 @@ s,@CPPOUTFILE@,-P,;t t
s,@LIBPATHFLAG@, -libpath:"%s",;t t s,@LIBPATHFLAG@, -libpath:"%s",;t t
s,@RPATHFLAG@,,;t t s,@RPATHFLAG@,,;t t
s,@LIBARG@,%s.lib,;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 !if $(MSC_VER) >= 1400
s,@LINK_SO@,@$$(RUBY) -run -e wait_writable -- -n 10 $$(@),;t t s,@LINK_SO@,@$$(RUBY) -run -e wait_writable -- -n 10 $$(@),;t t
s,@LINK_SO@,$(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t s,@LINK_SO@,$(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t
@ -689,7 +688,7 @@ miniruby: miniruby$(EXEEXT)
miniruby$(EXEEXT): miniruby$(EXEEXT):
@echo. $(LIBS) @echo. $(LIBS)
$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ $(LDFLAGS) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS)
@$(RM) miniruby.lib miniruby.exp @$(RM) miniruby.lib miniruby.exp
miniruby.exe -v miniruby.exe -v
$(LDSHARED_1) $(LDSHARED_1)
@ -701,7 +700,7 @@ miniruby.rc:
!if "$(PROGRAM)" != "" !if "$(PROGRAM)" != ""
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \ $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
$(OUTFLAG)$@ $(LIBRUBYARG) $(LDFLAGS) $(XLDFLAGS) $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
$(LDSHARED_0) $(LDSHARED_0)
$(LDSHARED_1) $(LDSHARED_1)
$(LDSHARED_2) $(LDSHARED_2)
@ -711,7 +710,7 @@ $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
$(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \ $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
$(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \ $(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
$(LDFLAGS) $(XLDFLAGS) -subsystem:Windows -link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
$(LDSHARED_0) $(LDSHARED_0)
$(LDSHARED_1) $(LDSHARED_1)
$(LDSHARED_2) $(LDSHARED_2)
@ -727,7 +726,7 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo. $(DLDOBJS) @echo. $(DLDOBJS)
@-$(PRE_LIBRUBY_UPDATE) @-$(PRE_LIBRUBY_UPDATE)
$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \ $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
$(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \ $(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \
$(LIBRUBY_DLDFLAGS) $(LIBRUBY_DLDFLAGS)
@$(RM) dummy.lib dummy.exp @$(RM) dummy.lib dummy.exp
$(LDSHARED_0) $(LDSHARED_0)