From 0b79f9d806dbf68fa0a986077fb6a17ac4c577dd Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Mon, 6 Jan 2020 08:36:11 +0000
Subject: build system: ccenv_common_init(): fully expand all cflags.

---
 Makefile.in           |  6 ++++++
 sofort/ccenv/ccenv.sh | 11 ++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 56b482c..7c9b134 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,12 @@ DISABLE_STATIC          = @disable_static@
 USE_CUSTOM_CFGDEFS      = @use_custom_cfgdefs@
 USE_CUSTOM_USRDEFS      = @use_custom_usrdefs@
 
+.cflags-host:
+	@printf '%s' "$(CFLAGS)"
+
+.cflags-native:
+	@printf '%s' "$(NATIVE_CFLAGS)"
+
 .SUFFIXES:
 
 all:
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh
index 8046209..2f61736 100644
--- a/sofort/ccenv/ccenv.sh
+++ b/sofort/ccenv/ccenv.sh
@@ -1247,14 +1247,7 @@ ccenv_common_init()
 
 	if [ $ccenv_cfgtype = 'host' ]; then
 		ccenv_tflags=
-		ccenv_cflags=
-
-		ccenv_cflags="$ccenv_cflags $mb_cflags_debug   $mb_cflags_config"
-		ccenv_cflags="$ccenv_cflags $mb_cflags_sysroot $mb_cflags_common"
-		ccenv_cflags="$ccenv_cflags $mb_cflags_cmdline $mb_cflags"
-		ccenv_cflags="$ccenv_cflags $mb_cflags_path    $mb_cflags_os"
-		ccenv_cflags="$ccenv_cflags $mb_cflags_site    $mb_cflags_strict"
-		ccenv_cflags="$ccenv_cflags $mb_cflags_last    $mb_cflags_once"
+		ccenv_cflags=$(make -s -f "$mb_pwd/Makefile.tmp" .cflags-host)
 
 		ccenv_cc="$mb_user_cc"
 		ccenv_cpp="$mb_user_cpp"
@@ -1264,7 +1257,7 @@ ccenv_common_init()
 		ccenv_pe_image_base="$mb_pe_image_base"
 	else
 		ccenv_tflags=
-		ccenv_cflags="$mb_native_cflags"
+		ccenv_cflags=$(make -s -f "$mb_pwd/Makefile.tmp" .cflags-native)
 		ccenv_cc="$mb_native_cc"
 		ccenv_cpp="$mb_native_cpp"
 		ccenv_cxx="$mb_native_cxx"
-- 
cgit v1.2.3