jani            Thu Jan 15 14:37:25 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/build      libtool.m4 
  Log:
  MFH:- Fixed bug #47104 (Linking shared extensions fails with icc)
  
http://cvs.php.net/viewvc.cgi/php-src/build/libtool.m4?r1=1.7.2.1&r2=1.7.2.1.4.1&diff_format=u
Index: php-src/build/libtool.m4
diff -u php-src/build/libtool.m4:1.7.2.1 php-src/build/libtool.m4:1.7.2.1.4.1
--- php-src/build/libtool.m4:1.7.2.1    Tue Nov 29 15:58:54 2005
+++ php-src/build/libtool.m4    Thu Jan 15 14:37:25 2009
@@ -4892,12 +4892,18 @@
            _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 @@
 
     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,



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to