From af75741cf6584b633ba170a1c867d1c020bb26d6 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 12 Jun 2021 13:45:53 +0000
Subject: build system: ccenv: added and integrated
 ccenv_set_cc_sysroot_vars().

---
 configure             |  4 ++--
 sofort/ccenv/ccenv.sh | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 0982754..20fde7a 100755
--- a/configure
+++ b/configure
@@ -651,11 +651,11 @@ common_defaults()
 	# sysroot
 	if [ -n "$mb_sysroot" ]; then
 		if [ -z "$mb_cflags_sysroot" ]; then
-			mb_cflags_sysroot="--sysroot=$mb_sysroot"
+			mb_cflags_sysroot='$(_CFLAGS_SYSROOT)'
 		fi
 
 		if [ -z "$mb_ldflags_sysroot" ]; then
-			mb_ldflags_sysroot="--sysroot=$mb_sysroot"
+			mb_ldflags_sysroot='$(_LDFLAGS_SYSROOT)'
 		fi
 	fi
 
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh
index 99a98ef..cf45cb2 100644
--- a/sofort/ccenv/ccenv.sh
+++ b/sofort/ccenv/ccenv.sh
@@ -1495,6 +1495,35 @@ ccenv_output_defs()
 	eval 'ccenv_'${ccenv_cfgtype}'_pkgconf'=\'$ccenv_pkgconf\'
 }
 
+ccenv_set_cc_sysroot_vars()
+{
+	if [ "$ccenv_cfgtype" = 'native' ] || [ -z "$mb_sysroot" ]; then
+		return 0
+	fi
+
+	cfgtest_host_section
+	ccenv_switch_var="--sysroot=${mb_sysroot}"
+
+	if cfgtest_compiler_switch_arg "${ccenv_switch_var}"; then
+		printf '\n# %s sysroot: cflags and ldflags\n' "$ccenv_cfgtype" \
+			>> "$ccenv_mk"
+
+		for ccenv_make_var in '_CFLAGS_SYSROOT' '_LDFLAGS_SYSROOT'; do
+			printf '%-40s= %s\n' "${ccenv_make_var}" "${ccenv_switch_var}" \
+				>> "$ccenv_mk"
+		done
+	else
+		printf '\n# %s sysroot: cflags and ldflags %s\n' "$ccenv_cfgtype" \
+			'(not supported: see config.log)'                          \
+			>> "$ccenv_mk"
+
+		for ccenv_make_var in '_CFLAGS_SYSROOT' '_LDFLAGS_SYSROOT'; do
+			printf '%-40s=\n' "${ccenv_make_var}" \
+				>> "$ccenv_mk"
+		done
+	fi
+}
+
 ccenv_set_cc_switch_vars()
 {
 	printf '\n# %s cflags: supported compiler switches\n' "$ccenv_cfgtype" \
@@ -1707,6 +1736,7 @@ ccenv_set_toolchain_variables()
 	ccenv_output_defs
 	ccenv_clean_up
 
+	ccenv_set_cc_sysroot_vars
 	ccenv_set_cc_switch_vars
 	ccenv_set_cc_linker_switch_vars
 }
-- 
cgit v1.2.3