diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 04:45:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 04:45:51 +0000 |
| commit | a3e3fcbcd074a012a090e785f71510c0cce7f350 (patch) | |
| tree | ad210cfe1ec355633dc83eb0d74f2b176561d970 /win32/Makefile.sub | |
| parent | 5157e572b8169f6a06bf265cea81da408ec0cd18 (diff) | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@22870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5c155b4005..c38477fbaa 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -167,7 +167,6 @@ CXXFLAGS = $(CFLAGS) !if !defined(LDFLAGS) LDFLAGS = -incremental:no -debug -opt:ref -opt:icf !endif -LDFLAGS = -link $(LDFLAGS) !if !defined(XLDFLAGS) XLDFLAGS = -stack:$(STACK) !endif @@ -653,7 +652,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 @@ -689,7 +688,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) @$(RM) miniruby.lib miniruby.exp miniruby.exe -v $(LDSHARED_1) @@ -701,7 +700,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) @@ -711,7 +710,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) @@ -727,7 +726,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) @$(RM) dummy.lib dummy.exp $(LDSHARED_0) |