# HG changeset patch
# User sla
# Date 1367576775 -7200
# Node ID 0380df7c3cd0e8ce543882041a196bbf51e07557
# Parent  c456f451038503b6e57d33935da49b0b7a66a095
8013785: Respect EXTRA_CFLAGS on windows
Reviewed-by: mgronlun, rbackman, kvn

diff -r c456f4510385 -r 0380df7c3cd0 make/windows/makefiles/compile.make
--- a/make/windows/makefiles/compile.make	Fri May 03 12:24:11 2013 +0200
+++ b/make/windows/makefiles/compile.make	Fri May 03 12:26:15 2013 +0200
@@ -52,7 +52,7 @@
 # improving the quality of crash log stack traces involving jvm.dll.
 
 # These are always used in all compiles
-CXX_FLAGS=/nologo /W3 /WX
+CXX_FLAGS=$(EXTRA_CFLAGS) /nologo /W3 /WX
 
 # Let's add debug information when Full Debug Symbols is enabled
 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
diff -r c456f4510385 -r 0380df7c3cd0 make/windows/makefiles/defs.make
--- a/make/windows/makefiles/defs.make	Fri May 03 12:24:11 2013 +0200
+++ b/make/windows/makefiles/defs.make	Fri May 03 12:26:15 2013 +0200
@@ -193,7 +193,7 @@
   MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
 endif
 
-NMAKE= MAKEFLAGS= MFLAGS= nmake -NOLOGO
+NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO
 ifndef SYSTEM_UNAME
   SYSTEM_UNAME := $(shell uname)
   export SYSTEM_UNAME