Mercurial > hg > truffle
comparison make/windows/makefiles/sa.make @ 12919:7638e35cabc6
8015614: Update build settings
Reviewed-by: tbell, dholmes, ahgross
author | erikj |
---|---|
date | Mon, 19 Aug 2013 17:47:21 +0200 |
parents | 5a98bf7d847b |
children | 1a93f2c5945a |
comparison
equal
deleted
inserted
replaced
12918:8f3c59225a5c | 12919:7638e35cabc6 |
---|---|
105 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp | 105 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp |
106 SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE) | 106 SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE) |
107 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" | 107 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
108 SA_LFLAGS = $(SA_LFLAGS) -map -debug | 108 SA_LFLAGS = $(SA_LFLAGS) -map -debug |
109 !endif | 109 !endif |
110 !if "$(BUILDARCH)" == "i486" | |
111 SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS) | |
112 !endif | |
110 | 113 |
111 # Note that we do not keep sawindbj.obj around as it would then | 114 # Note that we do not keep sawindbj.obj around as it would then |
112 # get included in the dumpbin command in build_vm_def.sh | 115 # get included in the dumpbin command in build_vm_def.sh |
113 | 116 |
114 # In VS2005 or VS2008 the link command creates a .manifest file that we want | 117 # In VS2005 or VS2008 the link command creates a .manifest file that we want |