This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] remove multiarch dirs when gnu indirect is not supported
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Cc: "H.J. Lu" <hongjiu dot lu at intel dot com>
- Date: Fri, 20 Aug 2010 02:54:23 -0400
- Subject: [PATCH] remove multiarch dirs when gnu indirect is not supported
The multiarch code tries to detect gnu indirect support in the assembler
and then disable multiarch support if it isn't found. The trouble is that
the sysnames paths have already been expanded to include multiarch subdirs
by the time the assembler check is executed. So even if multiarch is set
to no, the sysnames paths are not changed.
One way to fix things is to back out the multiarch subdirs when the
assembler is found to be lacking.
I'd also point out that commit 6f89d2f30f97211431d96 seems to have two
other minor problems:
- it breaks configue output by injecting its output in between
"checking sysdep dirs..." and the actual paths
- it duplicates an already existing gnu indirect assembler check
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-20 Mike Frysinger <vapier@gentoo.org>
* configure.in: Remove multiarch from sysnames when multi_arch!=yes.
* configure: Regenerated.
---
configure | 2 ++
configure.in | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index ac86386..1e67730 100755
--- a/configure
+++ b/configure
@@ -4252,6 +4252,8 @@ fi
if test x"$multi_arch" = xyes; then
$as_echo "#define USE_MULTIARCH 1" >>confdefs.h
+else
+ sysnames="`echo $sysnames | sed -e 's, [^ ]*/multiarch , ,g'`"
fi
diff --git a/configure.in b/configure.in
index 036a950..11760bb 100644
--- a/configure.in
+++ b/configure.in
@@ -746,6 +746,8 @@ rm -f conftest*])
fi
if test x"$multi_arch" = xyes; then
AC_DEFINE(USE_MULTIARCH)
+else
+ sysnames="`echo $sysnames | sed -e 's, [^ ]*/multiarch , ,g'`"
fi
AC_SUBST(multi_arch)
--
1.7.2