From 85d07da47580eb72902a09c50d36ad638359111c Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Fri, 17 Apr 2020 11:14:17 +0200
Subject: [PATCH] 8243059: Build fails when --with-vendor-name contains a comma

Use $$(VERSION_CFLAGS) so as to avoid the variable getting evaluated early

Reviewed-by: ihse, erikj
---
 make/launcher/LauncherCommon.gmk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
index c8679e860f4..6f7d3fb361a 100644
--- a/make/launcher/LauncherCommon.gmk
+++ b/make/launcher/LauncherCommon.gmk
@@ -138,9 +138,9 @@ define SetupBuildLauncherBody
       EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
       OPTIMIZATION := $$($1_OPTIMIZATION), \
       CFLAGS := $$(CFLAGS_JDKEXE) \
-          $(LAUNCHER_CFLAGS) \
-          $(VERSION_CFLAGS) \
-          -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
+          $$(LAUNCHER_CFLAGS) \
+          $$(VERSION_CFLAGS) \
+          -DLAUNCHER_NAME='"$$(LAUNCHER_NAME)"' \
           -DPROGNAME='"$1"' \
           $$($1_CFLAGS), \
       CFLAGS_solaris := -KPIC, \