In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/39234ceabe18aeebbd90822c648a304dcc29a895?hp=22e660b408c16433d6f9ffeb43d0faf79e16e502>
- Log ----------------------------------------------------------------- commit 39234ceabe18aeebbd90822c648a304dcc29a895 Author: Andy Dougherty <[email protected]> Date: Tue Sep 4 11:36:53 2012 -0400 Collapse duplicate settings in hints/solaris_2.sh M hints/solaris_2.sh commit b8cad20a5c86e1d8deb73ddf0713fe32e6e90b92 Author: Andy Dougherty <[email protected]> Date: Tue Sep 4 11:35:56 2012 -0400 Avoid garbled sed command in hints/solaris_2.sh Solaris sed does not understand the GNU /i flag. M hints/solaris_2.sh ----------------------------------------------------------------------- Summary of changes: hints/solaris_2.sh | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh index 0574ce7..5e6cf10 100644 --- a/hints/solaris_2.sh +++ b/hints/solaris_2.sh @@ -327,25 +327,18 @@ EOM if $tryworkshopcc >/dev/null 2>&1; then cc_name=`./try` if test "$cc_name" = "workshop"; then - ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^cc: //ip'`" - if test ! "$use64bitall_done"; then - loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth" - fi - # Sun cc doesn't support gcc attributes - d_attribute_format='undef' - d_attribute_malloc='undef' - d_attribute_nonnull='undef' - d_attribute_noreturn='undef' - d_attribute_pure='undef' - d_attribute_unused='undef' - d_attribute_warn_unused_result='undef' + ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^[Cc][Cc]: //p'`" fi if test "$cc_name" = "workshop CC"; then - ccversion="`${cc:-CC} -V 2>&1|sed -n -e '1s/^CC: //ip'`" + ccversion="`${cc:-CC} -V 2>&1|sed -n -e '1s/^[Cc][C]: //p'`" + fi + case "$cc_name" in + workshop*) + # Settings for either cc or CC if test ! "$use64bitall_done"; then loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth" fi - # Sun CC doesn't support gcc attributes + # Sun CC/cc don't support gcc attributes d_attribute_format='undef' d_attribute_malloc='undef' d_attribute_nonnull='undef' @@ -353,7 +346,8 @@ EOM d_attribute_pure='undef' d_attribute_unused='undef' d_attribute_warn_unused_result='undef' - fi + ;; + esac fi # See if as(1) is GNU as(1). GNU might not work for this job. -- Perl5 Master Repository
