From 12c8d11ee5c815425c9b36b2e4e981133d257614 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Mon, 23 Oct 2023 11:24:39 +0200
Subject: [PATCH] cmake: extra_flags: Use zephyr_get

This allows users to set `EXTRA_*FLAGS` variables when using sysbuild.

If these flags are provided in both local and global sysbuild scopes,
then only the local ones will be used for a given image. This is to
circumvent issues with mixing space-separated and `;`-separated lists.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
---
 cmake/extra_flags.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/extra_flags.cmake b/cmake/extra_flags.cmake
index 2e41720991..138262afb1 100644
--- a/cmake/extra_flags.cmake
+++ b/cmake/extra_flags.cmake
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 foreach(extra_flags EXTRA_CPPFLAGS EXTRA_LDFLAGS EXTRA_CFLAGS EXTRA_CXXFLAGS EXTRA_AFLAGS)
+  # Note: zephyr_get MERGE should not be used until issue #43959 is resolved.
+  zephyr_get(${extra_flags})
   list(LENGTH ${extra_flags} flags_length)
   if(flags_length LESS_EQUAL 1)
     # A length of zero means no argument.