From a676b948c8d91f32409a41e11a624026c5154f48 Mon Sep 17 00:00:00 2001
From: sla <unknown>
Date: Fri, 3 May 2013 12:26:15 +0200
Subject: [PATCH] 8013785: Respect EXTRA_CFLAGS on windows Reviewed-by:
 mgronlun, rbackman, kvn

---
 make/windows/makefiles/compile.make | 2 +-
 make/windows/makefiles/defs.make    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/windows/makefiles/compile.make b/make/windows/makefiles/compile.make
index 819aae43e..ea16fca3d 100644
--- a/make/windows/makefiles/compile.make
+++ b/make/windows/makefiles/compile.make
@@ -52,7 +52,7 @@ CXX=cl.exe
 # 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 --git a/make/windows/makefiles/defs.make b/make/windows/makefiles/defs.make
index 4bee0afa8..acf4d24d7 100644
--- a/make/windows/makefiles/defs.make
+++ b/make/windows/makefiles/defs.make
@@ -193,7 +193,7 @@ ifdef COOKED_BUILD_NUMBER
   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
-- 
GitLab