Mercurial > hg > graal-compiler

diff make/windows/makefiles/compile.make @ 12919:7638e35cabc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8015614: Update build settings Reviewed-by: tbell, dholmes, ahgross
author erikj
date Mon, 19 Aug 2013 17:47:21 +0200
parents 33c52908bcdb
children 1a93f2c5945a
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make	Thu Aug 15 21:33:37 2013 +0100
+++ b/make/windows/makefiles/compile.make	Mon Aug 19 17:47:21 2013 +0200
@@ -180,6 +180,7 @@
 PRODUCT_OPT_OPTION   = /O2 /Oy-
 FASTDEBUG_OPT_OPTION = /O2 /Oy-
 DEBUG_OPT_OPTION     = /Od
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2005"
@@ -198,6 +199,7 @@
 !if "x$(MT)" == "x"
 MT=mt.exe
 !endif
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2008"
@@ -211,6 +213,7 @@
 !if "x$(MT)" == "x"
 MT=mt.exe
 !endif
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2010"
@@ -240,9 +243,11 @@
 !if "x$(MT)" == "x"
 MT=mt.exe
 !endif
+SAFESEH_FLAG = /SAFESEH
+!endif
+
 !if "$(BUILDARCH)" == "i486"
-LD_FLAGS = /SAFESEH $(LD_FLAGS)
-!endif
+LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
 !endif
 
 # If NO_OPTIMIZATIONS is defined in the environment, turn everything off