From: Allan Sandfeld Jensen <snowwolf@one2one-networks.com>
Date: Tue, 18 Feb 2003 05:15:03 +0000 (+0000)
Subject: * libtool.m4: Intel icc fixups for version 7.0.
X-Git-Tag: release-1-5~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a25ee0157346fbc2ea987cdf731eca19698c019;p=thirdparty%2Flibtool.git

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

diff --git a/ChangeLog b/ChangeLog
index d1147a093..3fa436c22 100644
--- 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 1c842d171..b4e204df5 100644
--- 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