diff options
| author | Jani Taskinen <jani@php.net> | 2009-11-27 12:50:29 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-11-27 12:50:29 +0000 |
| commit | 01ba3e44b314044e684c04c5f277567bb0b0f334 (patch) | |
| tree | a39e2e2ffe36a899e0b60d82bba37fc027a4c3e4 | |
| parent | 14909202a876fe68c7efbafc34f519361cae30dc (diff) | |
| download | php-git-01ba3e44b314044e684c04c5f277567bb0b0f334.tar.gz | |
- Re-fixed bug #47104 (Linking shared extensions fails with icc)
| -rw-r--r-- | build/libtool.m4 | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/build/libtool.m4 b/build/libtool.m4 index 7875c123d7..5546588303 100644 --- a/build/libtool.m4 +++ b/build/libtool.m4 @@ -4891,12 +4891,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* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -5150,10 +5156,18 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) linux* | k*bsd*-gnu) 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, |