* libtool.m4: Intel icc fixups for version 7.0.

diff --git a/ChangeLog b/ChangeLog
index d1147a093c8cb5cadd01391cdbae2abf66360ee2..3fa436c22c68d0f6cb25c65ff8ca03d916aba145 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-17  Allan Sandfeld Jensen  <snowwolf@one2one-networks.com>
+
+       * libtool.m4: Intel icc fixups for version 7.0.
+
 2003-02-17  Ralph Schleicher  <rs@nunatak.allgaeu.org>
 
        * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Prepend a dot to

diff --git a/libtool.m4 b/libtool.m4
index 1c842d17157171832a277d0b68ee3c35be12a007..b4e204df53655df41ba0e4f80cf6ab77eafd15ff 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -2982,8 +2982,8 @@ case $host_os in
        # 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(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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'
@@ -4464,7 +4464,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            ;;
          icpc)
            # Intel C++
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption,ld,'
+           _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'
            ;; 
@@ -4692,7 +4692,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 
     linux*)
       if test "$CC" = "icc"; then
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption,ld,'
+       _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'
       fi