Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure identify_compiler also gives output in log mode for non-gcc compiler

Browse Source 
Additionally declare local vars at function entry.
This commit is contained in:
Tom G. Christensen 2012-06-03 16:23:30 +02:00
parent 13bd8b42d3
commit 51df067e56
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buildpkg.packaging.irix
View File

@ -1039,22 +1039,26 @@ set_configure_args()
identify_compiler() identify_compiler()
{ {
local mycc local mycc
local compiler
local compiler_temp
if [ $mipspro -eq 0 ]; then if [ $mipspro -eq 0 ]; then
[ -n "$CC" ] && mycc=$CC || mycc=gcc [ -n "$CC" ] && mycc=$CC || mycc=gcc
[ "$1" = "log" ] && $mycc -v [ "$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 else # not gcc
if [ "$_os" = "irix53" ]; then if [ "$_os" = "irix53" ]; then
local compiler="Irix 5.3 IDO" compiler="Irix 5.3 IDO"
else else
local compiler="$(cc -version 2>&1)" compiler="$(cc -version 2>&1)"
fi fi
[ "$1" = "log" ] && echo "$compiler"
if [ "$CXX" = "g++" ]; then if [ "$CXX" = "g++" ]; then
# SGI cc with gnu g++ # SGI cc with gnu g++
local compiler_temp="$(g++ -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')" [ "$1" = "log" ] && $CXX -v
local compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')" compiler_temp="$($CXX -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')"
local compiler="${compiler%\\*}" compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')"
compiler="${compiler%\\*}"
fi fi
fi fi
[ -z "$1" ] && echo "$compiler" [ -z "$1" ] && echo "$compiler"

16
buildpkg.packaging.solaris
View File

@ -335,21 +335,23 @@ add_dir()
identify_compiler() identify_compiler()
{ {
local mycc local mycc
local compiler
local compiler_temp
if [ $suncc -eq 0 ]; then if [ $suncc -eq 0 ]; then
[ -n "$CC" ] && mycc=$CC || mycc=gcc [ -n "$CC" ] && mycc=$CC || mycc=gcc
[ "$1" = "log" ] && $mycc -v [ "$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 else # not gcc
[ -n "$CC" ] && mycc=$CC || mycc=cc [ -n "$CC" ] && mycc=$CC || mycc=cc
[ "$1" = "log" ] && $mycc -v [ "$1" = "log" ] && $mycc -version
local compiler="$($mycc -version 2>&1)" compiler="$($mycc -version 2>&1)"
if [ "$CXX" = "g++" ]; then if [ "$CXX" = "g++" ]; then
# SUN cc with gnu g++ # SUN cc with gnu g++
[ "$1" = "log" ] && g++ -v [ "$1" = "log" ] && $CXX -v
local compiler_temp="$(g++ -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')" compiler_temp="$($CXX -v 2>&1 | ${__sed} -n '/^gcc/ s/gcc/g++/p')"
local compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')" compiler="$((echo $compiler; echo $compiler_temp) | ${__awk} '{ printf "%s\\n",$0 }')"
local compiler="${compiler%\\*}" compiler="${compiler%\\*}"
fi fi
fi fi
[ -z "$1" ] && echo "$compiler" [ -z "$1" ] && echo "$compiler"