From 6b9c570b38fbf210213a26651cbe2f17045e7f48 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 31 Jan 2020 15:53:43 -0800
Subject: [PATCH] build: correct the handling for the static variants

The static variants should use the same flags as the dynamic variants.
We missed the name conversion in the variable computation causing the
static and dynamic builds to diverge.
---
 utils/build-script-impl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/build-script-impl b/utils/build-script-impl
index b5b3264410f36..255ac4beb3844 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -1416,7 +1416,7 @@ for host in "${ALL_HOSTS[@]}"; do
         module_cache="${build_dir}/module-cache"
 
         # Add any specific cmake options specified by build-script
-        product_cmake_options_name=$(to_varname "${product}")_CMAKE_OPTIONS
+        product_cmake_options_name=$(to_varname "${product/_static}")_CMAKE_OPTIONS
         product_cmake_options=(${!product_cmake_options_name}) # convert to array
         cmake_options+=("${product_cmake_options[@]}")