summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-23 04:27:44 -0500
committermidipix <writeonce@midipix.org>2018-12-24 10:51:56 -0500
commitce3307a81dbea0f5d617bcdda471c5e460e5154f (patch)
treefc08ac2ef45ca83c0d92409e1a7dee0ba9a42882 /configure
parente2ed8bc44935bcd75918519c2d80e4b8650196aa (diff)
downloadapimagic-ce3307a81dbea0f5d617bcdda471c5e460e5154f.tar.bz2
apimagic-ce3307a81dbea0f5d617bcdda471c5e460e5154f.tar.xz
build system: target & native cchost logic: initial clean-up.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 9 insertions, 3 deletions
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