From 1094891e67359058eb1c86a14d14ce24e233723a Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Mon, 8 May 2017 16:14:35 +0000
Subject: [PATCH] Improve musl and uclibc detection

Do not enable musl or uclibc native support if a GNU linker is
already present. This avoids interference for example on a
Debian platform with musl-dev installed. More work is required
to select musl libc in that case, with additional configure flags.
---
 configure | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 23279298..3f8ace79 100755
--- a/configure
+++ b/configure
@@ -359,7 +359,14 @@ if test -z "$cross_prefix" ; then
 	fi
       fi
 
-      if test -f "/lib/ld-uClibc.so.0" ; then
+      # Enable uClibc or musl native support only if GNU ld is not already present
+      if test -f "/lib/ld-linux.so.2"; then
+	:
+      elif test -f "/lib64/ld-linux-x86-64.so.2"; then
+        :
+      elif test -f "/lib64/ld-linux-aarch64.so.1"; then
+        :
+      elif test -f "/lib/ld-uClibc.so.0" ; then
 	confvars="$confvars uClibc"
       elif test -f "/lib/ld-musl-$cpu.so.1"; then
         confvars="$confvars musl"