summaryrefslogtreecommitdiff
path: root/libssp/configure
diff options
context:
space:
mode:
authorgeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>2006-10-15 07:42:57 +0000
committergeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>2006-10-15 07:42:57 +0000
commitff4344250921a499b827eae88e7353069da0420b (patch)
treecf043af69064a496112900739079348012647f35 /libssp/configure
parenta5f53fac013f1cb7652a430fc5aacd950956399b (diff)
downloadgcc-ff4344250921a499b827eae88e7353069da0420b.tar.gz
Index: config/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com> * multi.m4: New file, from automake version 2 branch. Index: libgomp/ChangeLog 2006-10-14 Geoffrey Keating <geoffk@apple.com> * aclocal.m4: Regenerate. * configure: Regenerate. Index: libstdc++-v3/ChangeLog 2006-10-14 Geoffrey Keating <geoffk@apple.com> * aclocal.m4: Regenerate. * configure: Regenerate with released autoconf-2.59. Index: libobjc/ChangeLog 2006-10-14 Geoffrey Keating <geoffk@apple.com> * Makefile.in: Use multi_basedir instead of toplevel_srcdir. * configure.ac: Use multi.m4 from aclocal rather than custom code. Use multi_basedir instead of toplevel_srcdir. * aclocal.m4: Regenerate. * configure: Regenerate. Index: libssp/ChangeLog 2006-10-14 Geoffrey Keating <geoffk@apple.com> * aclocal.m4: Regenerate. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libssp/configure')
-rwxr-xr-xlibssp/configure9
1 files changed, 8 insertions, 1 deletions
diff --git a/libssp/configure b/libssp/configure
index dbb7abbd3c1..38f5b3ca356 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -1928,6 +1928,13 @@ else
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_config_commands="$ac_config_commands default-1"
@@ -4929,7 +4936,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4932 "configure"' > conftest.$ac_ext
+ echo '#line 4939 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?