Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8013785: Respect EXTRA_CFLAGS on windows
authorsla
Fri, 03 May 2013 12:26:15 +0200
changeset 17295 ebf76b993941
parent 17294 a1a03f4c1cab
child 17297 41a66b33c624
child 17298 7e956b7a3e87
8013785: Respect EXTRA_CFLAGS on windows Reviewed-by: mgronlun, rbackman, kvn
hotspot/make/windows/makefiles/compile.make file | annotate | diff | comparison | revisions
hotspot/make/windows/makefiles/defs.make file | annotate | diff | comparison | revisions 
--- a/hotspot/make/windows/makefiles/compile.make	Fri May 03 12:24:11 2013 +0200
+++ b/hotspot/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"
--- a/hotspot/make/windows/makefiles/defs.make	Fri May 03 12:24:11 2013 +0200
+++ b/hotspot/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
jdk-sandbox