aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorGeoffrey Keating <geoffk@geoffk.org>2007-06-07 18:43:51 +0000
committerGeoffrey Keating <geoffk@geoffk.org>2007-06-07 18:43:51 +0000
commit958afec3733c2b88bf518cbc1f275878d04cf43e (patch)
tree7842286bc2ed69b88233c5c259798b22eb663131 /libiberty
parent1fc01e0339a2ffbae943acefdc99dbf3bda68274 (diff)
downloadgdb-958afec3733c2b88bf518cbc1f275878d04cf43e.zip
gdb-958afec3733c2b88bf518cbc1f275878d04cf43e.tar.gz
gdb-958afec3733c2b88bf518cbc1f275878d04cf43e.tar.bz2
* configure.ac: Non-default multilibs can be cross compilations.
* configure: Regenerate
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog5
-rwxr-xr-xlibiberty/configure24
-rw-r--r--libiberty/configure.ac19
3 files changed, 48 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index a421784..233b175 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07 Geoffrey Keating <geoffk@apple.com>
+
+ * configure.ac: Non-default multilibs can be cross compilations.
+ * configure: Regenerate
+
2007-05-07 Nathan Froyd <froydnj@codesourcery.com>
* argv.c (writeargv): New function.
diff --git a/libiberty/configure b/libiberty/configure
index 56d039e..c745d8b 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -847,6 +847,7 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
+ --enable-multilib build many library versions (default)
--enable-install-libiberty Install headers for end users
Optional Packages:
@@ -1727,6 +1728,29 @@ else
fi
+# Add --enable-multilib to configure.
+# Default to --enable-multilib
+# Check whether --enable-multilib or --disable-multilib was given.
+if test "${enable_multilib+set}" = set; then
+ enableval="$enable_multilib"
+ case "$enableval" in
+ yes) multilib=yes ;;
+ no) multilib=no ;;
+ *) { { echo "$as_me:$LINENO: error: bad value $enableval for multilib option" >&5
+echo "$as_me: error: bad value $enableval for multilib option" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+else
+ multilib=yes
+fi;
+
+# Even if the default multilib is not a cross compilation,
+# it may be that some of the other multilibs are.
+if test $cross_compiling = no && test $multilib = yes \
+ && test "x${with_multisubdir}" != x ; then
+ cross_compiling=maybe
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index fe4633f..cdc3cd3 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -109,6 +109,25 @@ dnl to call AC_CHECK_PROG.
AC_CHECK_TOOL(AR, ar)
AC_CHECK_TOOL(RANLIB, ranlib, :)
+dnl When switching to automake, replace the following with AM_ENABLE_MULTILIB.
+# Add --enable-multilib to configure.
+# Default to --enable-multilib
+AC_ARG_ENABLE(multilib,
+[ --enable-multilib build many library versions (default)],
+[case "$enableval" in
+ yes) multilib=yes ;;
+ no) multilib=no ;;
+ *) AC_MSG_ERROR([bad value $enableval for multilib option]) ;;
+ esac],
+ [multilib=yes])
+
+# Even if the default multilib is not a cross compilation,
+# it may be that some of the other multilibs are.
+if test $cross_compiling = no && test $multilib = yes \
+ && test "x${with_multisubdir}" != x ; then
+ cross_compiling=maybe
+fi
+
GCC_NO_EXECUTABLES
AC_PROG_CC
AC_PROG_CPP_WERROR