From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 19 Apr 2004 15:04:17 +0000 (+0000)
Subject: * m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Detect Intel C++ compiler
X-Git-Tag: release-1-9b~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4acb7905fab52bee7b8b350f9d08153cdef8ffcd;p=thirdparty%2Flibtool.git

* m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Detect Intel C++ compiler
version more idiomatically.
---

diff --git a/ChangeLog b/ChangeLog
index 311e9607e..04b1668ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-19  Gary V. Vaughan  <gary@gnu.org>
+
+	* m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Detect Intel C++ compiler
+	version more idiomatically.
+
 2004-04-19  Albert Chin-A-Young  <china@thewrittenword.com>
 
 	* m4/libtool.m4: Use cc rather than ld to created
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f97c0ad16..cdb483e7a 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -4989,18 +4989,16 @@ if test -n "$compiler"; then
   	with_gnu_ld=yes
 	# version 8.0 and above of icpc choke on multiply defined symbols
 	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.  Only 8.0 (and newer?)
-	# support the --version argument, so we use that to distinguish them:
-	lt_icpc_version=`icpc --version 2>/dev/null`
-	case $lt_icpc_version in
-	[[0-9.]]*)  # Version 8.0 or newer
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*) # No output from 7.1 and older
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
   	  _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'
 	  ;;
+	*)  # Version 8.0 or newer
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
 	esac
   	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
   	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'