From 3227b49a7ab5c7a71b5c0a87f3a6984d4b528589 Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Thu, 9 Mar 2023 16:07:16 +0000
Subject: [PATCH] 8303760: Visual Studio should use the primary variant in the
 IDE

Reviewed-by: erikj
---
 make/ide/visualstudio/hotspot/CreateVSProject.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/ide/visualstudio/hotspot/CreateVSProject.gmk b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
index 2f1b7e088a0..17051fd03d0 100644
--- a/make/ide/visualstudio/hotspot/CreateVSProject.gmk
+++ b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
@@ -35,8 +35,8 @@ ifeq ($(call isTargetOs, windows), true)
   # The next part is a bit hacky. We include the CompileJvm.gmk to be
   # able to extract flags, but we do not wish to execute the rules.
 
-  # Use server as base for defines and includes
-  JVM_VARIANT=server
+  # Use primary variant for defines and includes
+  JVM_VARIANT := $(JVM_VARIANT_MAIN)
 
   include HotspotCommon.gmk
   include lib/CompileJvm.gmk