From 1e41844947bc68735ddbf3e6aec724f78f03bc2a Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Mon, 9 May 2022 14:56:12 +0300
Subject: [PATCH] Fix packs.product subset build with gcc (#68998)

---
 eng/build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/build.sh b/eng/build.sh
index 167f8e2014182..9c9beb471f1fb 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -382,7 +382,8 @@ while [[ $# > 0 ]]; do
       ;;
 
      -clang*)
-      arguments="$arguments /p:Compiler=$opt"
+      compiler="${opt/#-/}" # -clang-9 => clang-9 or clang-9 => (unchanged)
+      arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
       shift 1
       ;;
 
@@ -396,7 +397,8 @@ while [[ $# > 0 ]]; do
       ;;
 
      -gcc*)
-      arguments="$arguments /p:Compiler=$opt"
+      compiler="${opt/#-/}" # -gcc-9 => gcc-9 or gcc-9 => (unchanged)
+      arguments="$arguments /p:Compiler=$compiler /p:CppCompilerAndLinker=$compiler"
       shift 1
       ;;