Mercurial > hg > truffle

comparison make/windows/makefiles/sa.make @ 4891:719f7007c8e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141242: build-infra merge: Rename CPP->CXX and LINK->LD Summary: Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker. Reviewed-by: dholmes, ohrstrom
author erikj
date Mon, 06 Feb 2012 09:14:22 +0100
parents 098acdf97f09
children d652a62d6e03
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
89 !elseif "$(BUILDARCH)" == "amd64" 89 !elseif "$(BUILDARCH)" == "amd64"
90 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 90 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
91 !if "$(COMPILER_NAME)" == "VS2005" 91 !if "$(COMPILER_NAME)" == "VS2005"
92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, 92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line,
93 # otherwise we get missing __security_check_cookie externals at link time. 93 # otherwise we get missing __security_check_cookie externals at link time.
94 SA_LINK_FLAGS = bufferoverflowU.lib 94 SA_LD_FLAGS = bufferoverflowU.lib
95 !endif 95 !endif
96 !else 96 !else
97 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 97 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
98 !endif 98 !endif
99 !if "$(MT)" != "" 99 !if "$(MT)" != ""
100 SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS) 100 SA_LD_FLAGS = /manifest $(SA_LD_FLAGS)
101 !endif 101 !endif
102 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp 102 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
103 SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE) 103 SA_LFLAGS = $(SA_LD_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE)
104 104
105 # Note that we do not keep sawindbj.obj around as it would then 105 # Note that we do not keep sawindbj.obj around as it would then
106 # get included in the dumpbin command in build_vm_def.sh 106 # get included in the dumpbin command in build_vm_def.sh
107 107
108 # In VS2005 or VS2008 the link command creates a .manifest file that we want 108 # In VS2005 or VS2008 the link command creates a .manifest file that we want
109 # to insert into the linked artifact so we do not need to track it separately. 109 # to insert into the linked artifact so we do not need to track it separately.
110 # Use ";#2" for .dll and ";#1" for .exe in the MT command below: 110 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
111 $(SAWINDBG): $(SASRCFILE) 111 $(SAWINDBG): $(SASRCFILE)
112 set INCLUDE=$(SA_INCLUDE)$(INCLUDE) 112 set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
113 $(CPP) @<< 113 $(CXX) @<<
114 /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32" 114 /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32"
115 /I"$(GENERATED)" $(SA_CFLAGS) 115 /I"$(GENERATED)" $(SA_CFLAGS)
116 $(SASRCFILE) 116 $(SASRCFILE)
117 /out:sawindbg.obj 117 /out:sawindbg.obj
118 << 118 <<
119 set LIB=$(SA_LIB)$(LIB) 119 set LIB=$(SA_LIB)$(LIB)
120 $(LINK) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS) 120 $(LD) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS)
121 !if "$(MT)" != "" 121 !if "$(MT)" != ""
122 $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2 122 $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2
123 !endif 123 !endif
124 -@rm -f sawindbg.obj 124 -@rm -f sawindbg.obj
125 125