summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2009-01-15 14:37:25 +0000
committerJani Taskinen <jani@php.net>2009-01-15 14:37:25 +0000
commitb32d357e7a1ceebf6f2db067b398f9e2b0888fe9 (patch)
treeb693593a445ab1b954c1110ac32f7208c2f20af8 /build
parent1de33abc50532030814b9434cdc91227d0cc17f4 (diff)
downloadphp-git-b32d357e7a1ceebf6f2db067b398f9e2b0888fe9.tar.gz
MFH:- Fixed bug #47104 (Linking shared extensions fails with icc)
Diffstat (limited to 'build')
-rw-r--r--build/libtool.m434
1 files changed, 24 insertions, 10 deletions
diff --git a/build/libtool.m4 b/build/libtool.m4
index a4ccb3c7bc..064582c5c7 100644
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -4892,12 +4892,18 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
- icpc* | ecpc*)
- # Intel C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
+ ecpc*)
+ # old Intel C++ for x86_64 which still supported -KPIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ icpc*)
+ # Intel C++, used to be incompatible with GCC.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
pgCC*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5138,10 +5144,18 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
linux*)
case $cc_basename in
- icc* | ecc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,