From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 9 Jan 2011 16:55:17 +0000 (+0100)
Subject: Fix $wl setting for Solaris Studio 12.2 f90 on GNU/Linux.
X-Git-Tag: v2.4.2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55208d56bf723f68b245c6ea03ce3f36a2e23ba;p=thirdparty%2Flibtool.git

Fix $wl setting for Solaris Studio 12.2 f90 on GNU/Linux.

* libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) [linux]
<lt_prog_compiler_wl>: Set to '-Qoption ld ' if we
detect Sun Fortran version 8.4 or newer.
Report by Terry Dontje.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index bcbc44842..186ccc3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix $wl setting for Solaris Studio 12.2 f90 on GNU/Linux.
+	* libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) [linux]
+	<lt_prog_compiler_wl>: Set to '-Qoption ld ' if we
+	detect Sun Fortran version 8.4 or newer.
+	Report by Terry Dontje.
+
 2011-01-07  Peter Rosin  <peda@lysator.liu.se>
 
 	Convert file name to toolchain format when blessing archives.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index c14475504..fd79dcfc0 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4363,12 +4363,17 @@ m4_if([$1], [CXX], [
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'