From 8fe36bed486b2e6138fe33bef78a8123cf629a29 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 11 Jun 2018 20:18:38 +0200
Subject: [PATCH] 8204682: Parsing for LOG=report=none is broken when combined
 with other keywords

Reviewed-by: erikj
---
 make/InitSupport.gmk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index 37bb7ebdd2f..e885e0fb1a3 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -34,6 +34,9 @@ _INITSUPPORT_GMK := 1
 
 ifeq ($(HAS_SPEC),)
 
+  # COMMA is defined in spec.gmk, but that is not included yet
+  COMMA := ,
+
   # Include the corresponding closed file, if present.
   ifneq ($(CUSTOM_MAKE_DIR), )
     -include $(CUSTOM_MAKE_DIR)/InitSupport.gmk
@@ -531,8 +534,6 @@ endif # HAS_SPEC
 define ParseLogOption
   ifneq ($$(findstring $1, $$(LOG)),)
     override $2 := true
-    # COMMA is defined in spec.gmk, but that is not included yet
-    COMMA := ,
     # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
     LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$$(strip $1),, $$(LOG)))
     # We might have ended up with a leading comma. Remove it. Need override
@@ -550,8 +551,6 @@ define ParseLogValue
     # Make words of out comma-separated list and find the one with opt=val
     value := $$(strip $$(subst $$(strip $1)=,, $$(filter $$(strip $1)=%, $$(subst $$(COMMA), , $$(LOG)))))
     override $2 := $$(value)
-    # COMMA is defined in spec.gmk, but that is not included yet
-    COMMA := ,
     # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
     LOG_STRIPPED := $$(subst $$(strip $1)=$$(value),, \
         $$(subst $$(COMMA)$$(strip $1)=$$(value),, $$(LOG)))