Re: Porting libtool to linux-icc (mark II) [PATCH]

[Robert Boehne]

Hello,

I've approved this patch pending copyright assignment.

ChangeLog entry:
2002-09-24  Allan Sandfeld Jensen  <address@hidden>

        * libtool.m4: Add support for Intel icc compiler for Linux.

-- 
Robert Boehne             Software Engineer
Ricardo Software   Chicago Technical Center
TEL: (630)789-0003 x. 238
FAX: (630)789-0127
email:  rboehne AT ricardo-us DOT com

Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libtool.m4,v
retrieving revision 1.264
diff -u -r1.264 libtool.m4
--- libtool.m4  10 Sep 2002 13:50:06 -0000      1.264
+++ libtool.m4  24 Sep 2002 23:06:32 -0000
@@ -2425,7 +2425,7 @@
 _LT_AC_TAGVAR(compiler, $1)=$CC
 cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 
-# We don't want -fno-exception wen compiling C++ code, so set the
+# We don't want -fno-exception when compiling C++ code, so set the
 # no_builtin_flag separately
 if test "$GXX" = yes; then
   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
@@ -2803,6 +2803,19 @@
        # dependencies.
        output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v 
conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | sed 
"s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in 
conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; 
done; echo $list'
        ;;
+      icpc)
+       # Intel C++
+       with_gnu_ld=yes
+       
+        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o 
$lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+               
+       _LT_AC_TAGVAR(whole_archive_flag_spec, 
$1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+       ;;
     esac
     ;;
   lynxos*)
@@ -4220,6 +4233,12 @@
            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
            ;;
+         icpc)
+           # Intel C++
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption,ld,'
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           ;; 
          *)
            ;;
        esac
@@ -4416,7 +4435,13 @@
       # PIC (with -KPIC) is the default.
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
-
+    linux*)
+      if test "$CC" = icc; then
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption,ld,'
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+      fi
+      ;;
     newsos6)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5260,6 +5285,9 @@
 # Do we need to explicitly link libc?
 #
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+if test "$enable_shared" = yes && test "$CC" = icc; then
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+fi
 if test "$enable_shared" = yes && test "$GCC" = yes; then
   case $_LT_AC_TAGVAR(archive_cmds, $1) in
   *'~'*)