From 51df067e5661cdaad68d6944a81d2dcfaacd5861 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 3 Jun 2012 16:23:30 +0200
Subject: [PATCH] Make sure identify_compiler also gives output in log mode for
 non-gcc compiler

Additionally declare local vars at function entry.
---
 buildpkg.packaging.irix    | 16 ++++++++++------
 buildpkg.packaging.solaris | 16 +++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/buildpkg.packaging.irix b/buildpkg.packaging.irix
index 3ac83b4..4f21b25 100644
--- a/buildpkg.packaging.irix
+++ b/buildpkg.packaging.irix
@@ -1039,22 +1039,26 @@ set_configure_args()
 identify_compiler()
 {
     local mycc
+    local compiler
+    local compiler_temp
 
     if [ $mipspro -eq 0 ]; then
 	[ -n "$CC" ] && mycc=$CC || mycc=gcc
 	[ "$1" = "log" ] && $mycc -v
-	local compiler="$($mycc -v 2>&1 | ${__sed} -n '/^gcc/p')"
+	compiler="$($mycc -v 2>&1 | ${__sed} -n '/^gcc/p')"
     else # not gcc
 	if [ "$_os" = "irix53" ]; then
-	    local compiler="Irix 5.3 IDO"
+	    compiler="Irix 5.3 IDO"
 	else
-	    local compiler="$(cc -version 2>&1)"
+	    compiler="$(cc -version 2>&1)"
 	fi
+	[ "$1" = "log" ] && echo "$compiler"
 	if [ "$CXX" = "g++" ]; then
 	    # SGI cc with gnu g++
-	    local compiler_temp="$(g++ -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')"
-	    local compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')"
-	    local compiler="${compiler%\\*}"
+	    [ "$1" = "log" ] && $CXX -v
+	    compiler_temp="$($CXX -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')"
+	    compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')"
+	    compiler="${compiler%\\*}"
 	fi
     fi
     [ -z "$1" ] && echo "$compiler"
diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index df2695f..eb540c6 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -335,21 +335,23 @@ add_dir()
 identify_compiler()
 {
     local mycc
+    local compiler
+    local compiler_temp
 
     if [ $suncc -eq 0 ]; then
 	[ -n "$CC" ] && mycc=$CC || mycc=gcc
 	[ "$1" = "log" ] && $mycc -v
-	local compiler="$($mycc -v 2>&1 | ${__sed} -n '/^gcc/p')"
+	compiler="$($mycc -v 2>&1 | ${__sed} -n '/^gcc/p')"
     else # not gcc
 	[ -n "$CC" ] && mycc=$CC || mycc=cc
-	[ "$1" = "log" ] && $mycc -v
-	local compiler="$($mycc -version 2>&1)"
+	[ "$1" = "log" ] && $mycc -version
+	compiler="$($mycc -version 2>&1)"
 	if [ "$CXX" = "g++" ]; then
 	    # SUN cc with gnu g++
-	    [ "$1" = "log" ] && g++ -v
-	    local compiler_temp="$(g++ -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')"
-	    local compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')"
-	    local compiler="${compiler%\\*}"
+	    [ "$1" = "log" ] && $CXX -v
+	    compiler_temp="$($CXX -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')"
+	    compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')"
+	    compiler="${compiler%\\*}"
 	fi
     fi
     [ -z "$1" ] && echo "$compiler"