From 0d14e7e698ceb0b9b4d022ddacab43f1c1c3252d Mon Sep 17 00:00:00 2001 From: grischka Date: Mon, 28 Nov 2016 14:48:54 +0100 Subject: [PATCH] configure: prefer lib64 on 64-bit platforms use lib64 if - "/usr/lib/multi-arch-triplet" does not work and - we are on a 64-bit platform and - lib64 exists and does contain crti.o --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 491fad7..f02d6e4 100755 --- a/configure +++ b/configure @@ -325,8 +325,10 @@ if test -z "$cross_prefix" ; then fi if test -z "$triplet"; then - if test ! -f "/usr/lib/crti.o" -a -f "/usr/lib64/crti.o" ; then - tcc_lddir="lib64" + if test $cpu = "x86-64" -o $cpu = "aarch64" ; then + if test -f "/usr/lib64/crti.o" ; then + tcc_lddir="lib64" + fi fi fi @@ -401,7 +403,6 @@ prefix=$prefix bindir=\$(DESTDIR)$bindir tccdir=\$(DESTDIR)$tccdir libdir=\$(DESTDIR)$libdir -ln_libdir=$libdir includedir=\$(DESTDIR)$includedir mandir=\$(DESTDIR)$mandir infodir=\$(DESTDIR)$infodir