From b3b5b5e6b600d52ed429cdcf19144e431ab17296 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 18 Dec 2003 12:48:43 +0000
Subject: * eval.c (stack_extend): ignore inline optimization on VC7.

* win32/Makefile.sub (OS, RT): can override.

* win32/Makefile.sub (LDFLAGS): ditto. shouldn't use pdb:none
  option. based on Tietew's patch [ruby-dev:22289]

* lib/mkmf.rb (create_makefile): should remove deffile if it's
  made by miniruby. based on nobu's patch.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'win32/Makefile.sub')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e591386d1f..6e669aceda 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -66,8 +66,10 @@ DEBUGFLAGS = -Zi
 !if !defined(OPTFLAGS)
 OPTFLAGS = -O2b2xg-
 !endif
+!if !defined(OS) || !defined(RT)
 OS = mswin32
 RT = msvcrt
+!endif
 
 !ifndef RUBY_SO_NAME
 RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
@@ -91,8 +93,11 @@ CFLAGS = -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
 !if !defined(CPPFLAGS)
 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing
 !endif
+!if !defined(LDFLAGS)
+LDFLAGS = -link -incremental:no -debug -opt:ref -opt:icf
+!endif
 !if !defined(XLDFLAGS)
-XLDFLAGS = 
+XLDFLAGS = -stack:$(STACK)
 !endif
 !if !defined(RFLAGS)
 RFLAGS = -r
@@ -108,9 +113,7 @@ CC = $(CC) -nologo
 LD = $(CC)
 LDSHARED = $(LD) -LD
 XCFLAGS = -DRUBY_EXPORT
-LDFLAGS = -link -incremental:no -pdb:none
 DLDFLAGS = $(LDFLAGS) -dll
-XLDFLAGS = -stack:$(STACK)
 SOLIBS = 
 
 LIBRUBY_LDSHARED = $(LDSHARED)
-- 
cgit v1.2.3