From fd4fcc7a6cc0f242a6c1b08248fde214652015b5 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 19 Jul 2019 16:02:41 +0000
Subject:  Simplify cross-build support some more

---
 configure | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index d4bcbb4..2248242 100755
--- a/configure
+++ b/configure
@@ -363,10 +363,9 @@ trycc ${CC}
 if test -n "$cross" && test -n "$CC_AUTO" ; then
   b=`basename "$CC"`
   if test "${b}" = "${b##$cross}" ; then
-    echo "Warning: compiler $CC is declared as a cross-compiler for target $target but does not start with prefix $cross" 1>&2
+    echo "$0: warning: compiler $CC is declared as a cross-compiler for target $target but does not start with prefix $cross" 1>&2
   fi
 fi
-trycc ${cross}${CC}
 trycc ${cross}gcc
 trycc ${cross}clang
 trycc ${cross}cc
@@ -434,6 +433,9 @@ if test -n "$sysdeps" ; then
   timer_lib=$(cat $sysdeps/timer.lib)
   util_lib=$(cat $sysdeps/util.lib)
 else
+  if test -n "$cross" ; then
+    echo "$0: warning: possible cross-build attempt with a native compiler" 1>&2
+  fi
   sysdeps=sysdeps.cfg
   mkdir -p $sysdeps
   echo "$target" > $sysdeps/target
@@ -594,7 +596,7 @@ SYSCLOCK_LIB := ${sysclock_lib}
 TAINNOW_LIB := ${tainnow_lib}
 TIMER_LIB := ${timer_lib}
 UTIL_LIB := ${util_lib}
-CC := ${CC_AUTO##${cross}}
+CC := ${CC_AUTO}
 CPPFLAGS_AUTO := $CPPFLAGS_AUTO
 CPPFLAGS := $CPPFLAGS $CPPFLAGS_POST
 CFLAGS_AUTO := $CFLAGS_AUTO
-- 
cgit v1.3.1