diff options
| author | Arno Töll <arno@debian.org> | 2013-10-15 20:19:13 +0200 |
|---|---|---|
| committer | Arno Töll <arno@debian.org> | 2013-10-15 20:19:13 +0200 |
| commit | e2b24c8fd106ecd3efb7a03db0a8dbf6153f9b9e (patch) | |
| tree | bcbcf401b0739078884c0e51e87d19a33f0540f0 /m4/libtool.m4 | |
| parent | 8aaa5891149f731a0975998f5d81d9a264cf8bb9 (diff) | |
| parent | 1380410981681f011377225708e9c530330fd5a0 (diff) | |
| download | lighttpd-e2b24c8fd106ecd3efb7a03db0a8dbf6153f9b9e.tar.gz | |
Merge tag 'upstream/1.4.33'
Upstream version 1.4.33
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 |