diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-19 10:37:08 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-19 10:37:08 +0100 |
| commit | addc7f72541eaa534e1f0f85666f16ba0ccd4cca (patch) | |
| tree | 1300725167f7d101870578106eca41fdbd39fe18 /m4/libtool.m4 | |
| parent | 0970bbad497389e152cbe47192e61329d4d3ad9f (diff) | |
Imported Upstream version 1.0.4upstream/1.0.4
Diffstat (limited to 'm4/libtool.m4')
| -rw-r--r-- | m4/libtool.m4 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 534d1cc..02b4bbe 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1324,7 +1324,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -1688,7 +1695,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else |