changeset 4492:a8a071629df4 jdk7u40-b25

Merge
author amurillo
date Tue, 14 May 2013 15:18:14 -0700
parents f8075a623349 b6796efaadca
children 7c93562242eb
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make	Thu May 09 06:12:12 2013 -0700
+++ b/make/windows/makefiles/compile.make	Tue May 14 15:18:14 2013 -0700
@@ -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"
--- a/make/windows/makefiles/defs.make	Thu May 09 06:12:12 2013 -0700
+++ b/make/windows/makefiles/defs.make	Tue May 14 15:18:14 2013 -0700
@@ -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