1.1 --- a/make/windows/makefiles/sa.make Tue Jan 31 13:12:39 2012 +0100
1.2 +++ b/make/windows/makefiles/sa.make Mon Feb 06 09:14:22 2012 +0100
1.3 @@ -91,16 +91,16 @@
1.4 !if "$(COMPILER_NAME)" == "VS2005"
1.5 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line,
1.6 # otherwise we get missing __security_check_cookie externals at link time.
1.7 -SA_LINK_FLAGS = bufferoverflowU.lib
1.8 +SA_LD_FLAGS = bufferoverflowU.lib
1.9 !endif
1.10 !else
1.11 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
1.12 !endif
1.13 !if "$(MT)" != ""
1.14 -SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS)
1.15 +SA_LD_FLAGS = /manifest $(SA_LD_FLAGS)
1.16 !endif
1.17 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
1.18 -SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE)
1.19 +SA_LFLAGS = $(SA_LD_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE)
1.20
1.21 # Note that we do not keep sawindbj.obj around as it would then
1.22 # get included in the dumpbin command in build_vm_def.sh
1.23 @@ -110,14 +110,14 @@
1.24 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
1.25 $(SAWINDBG): $(SASRCFILE)
1.26 set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
1.27 - $(CPP) @<<
1.28 + $(CXX) @<<
1.29 /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32"
1.30 /I"$(GENERATED)" $(SA_CFLAGS)
1.31 $(SASRCFILE)
1.32 /out:sawindbg.obj
1.33 <<
1.34 set LIB=$(SA_LIB)$(LIB)
1.35 - $(LINK) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS)
1.36 + $(LD) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS)
1.37 !if "$(MT)" != ""
1.38 $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2
1.39 !endif
