* configure.ac: Add user-friendly check for native x86_64-linux multilibs. * configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205975 138bc75d-0d04-0410-961f-82ee72b054a4
This commit is contained in:
parent
dc76d75756
commit
afc0578da2
3 changed files with 46 additions and 0 deletions
|
@ -1,3 +1,9 @@
|
|||
2013-12-13 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
|
||||
|
||||
* configure.ac: Add user-friendly check for native x86_64-linux
|
||||
multilibs.
|
||||
* configure: Regenerate.
|
||||
|
||||
2013-11-23 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* config.sub, config.guess: Import from upstream.
|
||||
|
|
20
configure
vendored
20
configure
vendored
|
@ -7500,6 +7500,26 @@ if test x${is_cross_compiler} = xyes ; then
|
|||
target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
|
||||
fi
|
||||
|
||||
# Special user-friendly check for native x86_64-linux build, if
|
||||
# multilib is not explicitly enabled.
|
||||
case "$target:$have_compiler:$host:$target:$enable_multilib" in
|
||||
x86_64-*linux*:yes:$build:$build:)
|
||||
# Make sure we have a developement environment that handles 32-bit
|
||||
dev64=no
|
||||
echo "int main () { return 0; }" > conftest.c
|
||||
${CC} -m32 -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c
|
||||
if test $? = 0 ; then
|
||||
if test -s conftest || test -s conftest.exe ; then
|
||||
dev64=yes
|
||||
fi
|
||||
fi
|
||||
rm -f conftest*
|
||||
if test x${dev64} != xyes ; then
|
||||
as_fn_error "I suspect your system does not have 32-bit developement libraries (libc and headers). If you have them, rerun configure with --enable-multilib. If you do not have them, and want to build a 64-bit-only compiler, rerun configure with --disable-multilib." "$LINENO" 5
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Default to --enable-multilib.
|
||||
if test x${enable_multilib} = x ; then
|
||||
target_configargs="--enable-multilib ${target_configargs}"
|
||||
|
|
20
configure.ac
20
configure.ac
|
@ -2879,6 +2879,26 @@ if test x${is_cross_compiler} = xyes ; then
|
|||
target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
|
||||
fi
|
||||
|
||||
# Special user-friendly check for native x86_64-linux build, if
|
||||
# multilib is not explicitly enabled.
|
||||
case "$target:$have_compiler:$host:$target:$enable_multilib" in
|
||||
x86_64-*linux*:yes:$build:$build:)
|
||||
# Make sure we have a developement environment that handles 32-bit
|
||||
dev64=no
|
||||
echo "int main () { return 0; }" > conftest.c
|
||||
${CC} -m32 -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c
|
||||
if test $? = 0 ; then
|
||||
if test -s conftest || test -s conftest.exe ; then
|
||||
dev64=yes
|
||||
fi
|
||||
fi
|
||||
rm -f conftest*
|
||||
if test x${dev64} != xyes ; then
|
||||
AC_MSG_ERROR([I suspect your system does not have 32-bit developement libraries (libc and headers). If you have them, rerun configure with --enable-multilib. If you do not have them, and want to build a 64-bit-only compiler, rerun configure with --disable-multilib.])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Default to --enable-multilib.
|
||||
if test x${enable_multilib} = x ; then
|
||||
target_configargs="--enable-multilib ${target_configargs}"
|
||||
|
|
Loading…
Reference in a new issue