From f7906de7e8554d418e942303ff37a095e63abb46 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 14 Jan 2025 19:42:53 +0000
Subject: [PATCH] depends: set env-provided flags to per-release

Users can now safely set flags and have them override the optional
per-release-type flags.

This also means that user-provided flags will now be forwarded to CMake's
build-type flags variables so that they'll correctly override the existing
values.
---
 depends/hosts/default.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/depends/hosts/default.mk b/depends/hosts/default.mk
index 22409c4004d..968f6de8fe4 100644
--- a/depends/hosts/default.mk
+++ b/depends/hosts/default.mk
@@ -29,12 +29,11 @@ endef
 
 define add_host_flags_func
 ifeq ($(filter $(origin $1),undefined default),)
-$(host_arch)_$(host_os)_$1 = $($1)
-$(host_arch)_$(host_os)_$(release_type)_$1 =
+$(host_arch)_$(host_os)_$(release_type)_$1 = $($1)
 else
-$(host_arch)_$(host_os)_$1 += $($(host_os)_$1)
 $(host_arch)_$(host_os)_$(release_type)_$1 += $($(host_os)_$(release_type)_$1)
 endif
+$(host_arch)_$(host_os)_$1 += $($(host_os)_$1)
 host_$1 = $$($(host_arch)_$(host_os)_$1)
 host_$(release_type)_$1 = $$($(host_arch)_$(host_os)_$(release_type)_$1)
 endef