From c68106f8d50a3daa8327ea67dfdfa3005dcec817 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sun, 23 Dec 2018 04:27:44 -0500
Subject: build system: target & native cchost logic: initial clean-up.

---
 configure | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 0c0ac00..96ab8a7 100755
--- a/configure
+++ b/configure
@@ -382,8 +382,7 @@ native_defaults()
 	fi
 
 	if [ -z "$mb_native_cc_host" ]; then
-		mb_native_cc_host=$($mb_project_dir/sysinfo/host/host.sh \
-			--compiler=$mb_native_cc --cflags="$mb_native_cc_cflags")
+		mb_native_cc_host=$($mb_native_cc $mb_native_cc_cflags -dumpmachine)
 	fi
 
 	if [ -z "$mb_compiler" ]; then
@@ -595,7 +594,14 @@ config_copy()
 
 	if [ -z "$mb_cchost" ]; then
 		if [ "$mb_host" = 'native' ]; then
-			mb_cchost=$(make -s -f $mb_pwd/Makefile.tmp cchost)
+			if [ -n "$mb_user_cc" ]; then
+				mbt_cc="$mb_user_cc"
+			else
+				mbt_cc="$mb_native_cc"
+			fi
+
+			mbt_cflags=$(make -f $mb_pwd/Makefile.tmp .display-cflags)
+			mb_cchost=$($mbt_cc $mbt_cflags -dumpmachine)
 		else
 			mb_cchost=$mb_host
 		fi
-- 
cgit v1.2.3