Mercurial > hg > truffle
diff make/windows/makefiles/sa.make @ 645:c3a720eefe82
6816308: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
Summary: Allow Hotspot builds with latest Windows SDK 6.1 on 64bit Windows 2003
Reviewed-by: ohair, tbell, jcoomes
| author | kvn |
|---|---|
| date | Mon, 16 Mar 2009 15:06:33 -0700 |
| parents | b6272ef4a18f |
| children | bd02caa94611 |
line wrap: on
line diff
--- a/make/windows/makefiles/sa.make Fri Mar 13 18:39:22 2009 -0700 +++ b/make/windows/makefiles/sa.make Mon Mar 16 15:06:33 2009 -0700 @@ -89,9 +89,11 @@ SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c !elseif "$(BUILDARCH)" == "amd64" SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +!if "$(COMPILER_NAME)" == "VS2005" # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, # otherwise we get missing __security_check_cookie externals at link time. SA_LINK_FLAGS = bufferoverflowU.lib +!endif !else SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c !endif