diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-12 04:16:31 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-12 04:16:31 +0000 |
| commit | f3fa74cb9b2b2118e00965339503426b4d06f168 (patch) | |
| tree | f4273d3b5294ab4d557bfd55d866ebc706bbeb78 /win32 | |
| parent | 4600cf725a86ce31266153647ae5aa1197b1215b (diff) | |
merges r22822 from trunk into ruby_1_9_1.
--
* win32/Makefile.sub (LDFLAGS): always prepends -link.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 818762ff7c..6cd1b28e06 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -164,8 +164,9 @@ CFLAGS = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) CXXFLAGS = $(CFLAGS) !endif !if !defined(LDFLAGS) -LDFLAGS = -link -incremental:no -debug -opt:ref -opt:icf +LDFLAGS = -incremental:no -debug -opt:ref -opt:icf !endif +LDFLAGS = -link $(LDFLAGS) !if !defined(XLDFLAGS) XLDFLAGS = -stack:$(STACK) !endif |